My only concern with those is they might not fit as well as OEM headlights. If that is the case, then an OEM lense might not fit without some extra work. Have you tried installing that housing as-is to see if it lines up as well as OEM?
Hatch Nation #8
September 2012 Ride of the Month