Bonneville Headlamp Question

Hi all,
I recently had my headlamp powder coated and decided to put it all back together today. Whilst replacing the rim to the headlight, I'm really struggling to get a tight fit. I'm presuming there shouldn't be a small gap between the headlight and the surround (water/rain). There's only 2 bolts and a spring loaded screw to put it together but it's proving far more difficult than I first thought!

Thanks

Steve

 

Here's a few photos for reference...

 

I think I might have had a bit of a 'doh' moment as when I fitted it back to the headlamp housing, it regained it's true shape and now seems a much better fit lol!