Ben,
from my recent trips I can recoomend the following:
INDO-PACIFIC
Tulamben, Bali - Villa Markisa resort www.villa-markisa.com .... Nitrox and full rental equipment available .... mostly macro and one wreck dive (US Liberty). I am going there (2nd visit) in mid June for two weeks
Lembeh, North Sulawesi - Kungkungan Bay Resort .... Nitrox and full rental equiment available .... macro.I may go there (6th visit) in late August for two weeks
Manado, North Sulawesi - Kima Bajo Resort .... Nitrox and full rental equipment available .... wide-angle & macro
Paradise Dancer, Peter Hugues fleet - North Sulawesi (April to September) and Raja Ampat (October to March) itineraries ... Nitrox and full rental equipment available .... North Sulwesi: wide-angle & macro - Raja Ampat: big animals, wide-angle & macro
Komodo Dancer, Peter Hugues fleet - Komodo .... Nitrox and full rental equipment available .... wide-angle & macro
Wakatobi and MV Pelagian, Central Sulawesi .... Nitrox and full rental equipment available .... wide-angle & macro
RED-SEA
various operators with live-aboards in:
Port Sudan (no nitrox .... sometimes full rental equipment available) .... wide-angle and big animals .... in March/April try booking a 2 weeks cruise going up north to the Angarosh region.
Hurghada/El Quseir (nitrox and full rental equipment available) .... wide-angle and big animals .... Brothers Islands or Marine Park itineraries in June/July
Sharm El Sheikh (nitrox and full rental equipment available) .... wide-angle and wrecks ..... June for big schools of fishes in Ras Mohammed
I would also include liveaboards in New Guinea & Solomon Islands (never been, but they are at the top of my wish-list !!!).
Have fun and keep us posted !!!
All the Best ..... Francesco
BTW .... Do you live in Shanghai ???