What if they looked like this:

The Medium Laser model is unchanged; the Large Laser gets a barrel, and the Small Laser gets a pyramidal cap that ends in a smaller aperture. The TAG laser is basically a Small Laser with a scaled-down Large Laser barrel.
This would be super easy to modify, and would fit perfectly into all the current geometries.