The Opt7 looks big but maybe not much difference.
I've got no problem cutting the housing a little and spreading it out just enough
so the bulb will fit, if need be...had to do that on a Yamaha years ago,
when switching to Halogen to fit the new bulb assembly...
then used black duct tape to go over the cuts to reseal everything.
Since that whole area was hidden by the stuff that surrounds it,
it works, doesn't leak, and doesn't look bad.
Hacksaw, make a straight 2" cut on each side, spread out with a screwdriver,
cover with the tape, TaDa! Invisible, but gives that little bit of extra room!