I would also suggest Komodo. Have been there twice, some great diving, good variety from Macro to Mantas. There are a number of LOBs going there, just a matter of choosing one that's suits your needs! However, the trip will take 7 - 10 days (I did the last trip on the Komodo Dancer). Also Alor has some great diving to offer. Lembeh Strait for some of the best muck diving. With limited time, you'll want to keep your flying to a minimum.