Previously, I installed aftermarket HID to my 2004 WRX, where the lowbeam bulb size is H1.

My installer cut a circular hole at the plastic cover at the rear of the lowbeam assembly, so that he can thread the wires of the HID bulb through this hole.
HOWEVER, the hole he cut was way larger than the grommet of the HID wires, so instead of using the HID wire grommet to "self-seal" with the hole of the plastic cover, he used hot glue gun to seal.

After 3.5 years, the HID bulbs went out, so I temporary replaced with the factory halogen bulbs.

Now, I want to re-install a new set of HID bulbs, but instead of using hot glue gun again to seal the hole (which is bad and ugly), I want to use HID wire grommet. The grommet that I'm talking about is like what you can see in this pic: http://www.lltek.com/images/HID/Hid_grommet.jpg
as shown between the back cover and the headlight assembly, at about mid-right of the pic.

As a result, I am looking for two new back covers which either:
(1) The same set used by 2004 WRX, and then I'll drill the circular hole, OR:
(2) The same set used by STI, and I assume they already have the holes (becoz STI has factory HID) so it is ready to be used by the aftermarket HID wiring grommet?

For (1), the cost for each cover is like $25 because it comes with 2 wires and a harness.
See this pic and search for #11: http://www.trademotion.com/schematics/7/7591021.gif

For (2), the cost for each cover is like $7. It doesn't come with any wires or harness.
See this pic and search for #9: http://www.trademotion.com/schematics/7/7591022.gif

Is #9 as shown on the second pic the one which has the circular hole for threading through the HID bulb's wiring? If so, do you know the diameter of the hole? I'm hoping for like 3/4" to 1" so the grommet can self-seal the hole without hot glue. Does this cover fit to the non-HID housing?

Please advise, thanks in advance!!

Any STI owner, or someone who knows the answer, can help me out? :)