The lights are 100% saloon lights and fit flush. I am aware the hatch lights slant another mate had some fitted on a Saff awhile back.

Its the back panel that does not fit properly, it appears too wide. As you stated, they are different shapes which is why he has gone for the hatch rear panel.