The cornering lanterns are H8 35W
I replaced mine with:
http://s.click.aliexpress.com/e/Mj6iEAEAA?af=138255236
about the same brightness but look better.
The main beam on the bi-xenon aren't great but all you can do is get whatver the best D2S bulbs are.
I don't think there is a fog-with main beam coding.
The beam pattern on the fogs is the opposite of what is needed for main beam.
You would have to replace them with spotlamps or somehow embed some in the original housings.