Indonesian waters are certainly the place to be because of the shear bio-diversity to be found, can I suggest a couple of websites for you to look at.
The first is
Wetpixel not sure if you enjoy taking photographs, irrespective of that there is plenty of info on the forum about Indonesian waters. They have a specific cruise in February, I know this isn't for you, but could give you some good ideas?
Diving4Images Another site you must check out is
Kapal Selam Dive Club this si a group of friends that dive together, it isn't a commercial operation. So great trip reports and I'm sure they could point you in the right direction for boat charter etc.
Let me know how you get on.