Yes, they are currently installed on my 07 A ABS. So, these will work for a GEN 2. I didn't need to modify anything and the rubber boots work with these also.
I use these Auxito LED bulbs from Amazon in my 07. They are the same dimensions as a stock halogen bulb so they fit perfectly in the socket with no modifications. Super bright with a good cutoff. I’ve had these installed since April and have yet to be flashed. High beams have a good reach and...