Hello Bonjo
Once you have those bolts AND the metal spacers removed, the spacers have to come out as well, the whole headlight unit should lift up with a little wriggling. The only thing that might be in your way is the top of the fork protector overlaps the frame of the headlight unit. If you bend it away from the frame slightly the headlight unit should just lift away. Be careful of pulling the wires.
The HID xenon upgrade is on my wishlist. The guys at HID50 have a reputation of providing the brightest (50W) HID Xenon upgrades and now do H4 kits suitable for the XTX/R. Pricey but reliable and at about 400% brighter than a halogen bulb those who have them think that they are worth it.
http://www.hid50.com/