headlight switch replacement and original

On the left is the Napa Echlin HL6554 on the right is the original headlight switch. Look closely at the front metal part the replacement (Napa) is squared off the original has a smooth curve to it. This is causing all kinds of problems in lining it up to reinstall the cover screw. The original lines right up but the Napa unit won't line up because of its squared corners interfering with the dash panel in the back.