MyG37 - HID bulb clips chipped, bulb isn't properly secured. Options?

I noticed today when changing my HID bulbs that the clips don't secure the bulbs properly. The tabs are chipped, so the clips don't really do anything. I was still able to close it up and get the lights to turn on properly.

Anyways, is the projector purely responsible for the cutoff line being straight? Or is this going to affect it as well? It probably moves a little every time I hit a bump, but I can't really tell.

And how can I fix this? I'm assuming if I get new projectors then the projector assembly is attached to it's own set of new tabs/clips. Can I swap out my projectors for some aftermarket ones? What are my options (do the Acura TL projectors fit)? And will installing them be expensive/time consuming for a professional to do?

Just looking for advice on how to fix this, I want a clean cutoff again (not that I can remember how clean it was before, but now it's on my mind). Buying brand new OEM assemblies is not gonna happen, not at the prices I found.

Thanks!

EDIT - Should mention that it's a 2013 G37 Sedan.