The Bosch unit appears to fit fine. The glass lens may be "old school" compared to the new fangled plastic ones, but I have yet to see a glass lens get the frosted foggy look that the plastic ones do. Plus, the beam pattern of the glass lens seems to be a lot better controlled. I have polished and re-coated lots of the plastic lenses used on cars and vans. They just don't stand up.
And if you are like me and use higher powered H4 bulbs, and ride at night a lot, the glass lens will not melt. I have seen a few of the plastic lenses distort due to the excess heat of running the 80/100 watt bulbs.