That sounds like a great trip...hope you get some feedback on dive sites. Be sure, be very very sure, to file a trip report when you get back!!!
Here's a thread from a guy who was headed to Kwaj but never filed a report that I'm aware of:
Kwaj next stop