Aftermarket HIDs in halogen housing... convert to true xenon?

My recent 99 528i purchase came with an aftermarket HID H7 kit in the stock halogen housing, blinding everyone and throwing light in all directions except directly forward. How can I best convert this setup to true HID? Can I buy projectors, shrouds and halos and put them in the stock housing or should I buy a new housing meant for HIDs and drop the H7s in there? Which is more cost effective and which gives best results? Thanks in advance.

My current terrible beam pattern.
http://ift.tt/1BTDWYH
The only time light goes forward is with the high beams on. Tried adjusting but to no avail.

Aftermarket HIDs in halogen housing... convert to true xenon?