Looking for recommendations for Indonesia, Malaysia diving

[Thaidive]

I'll be in South East Asia for two and a half months, October to December. I will have just retired and it's my retirement present to myself.

My wife will be with me the first half. I'm looking for advise and recommendations for dive resorts and locations in Sabah, Suliwesi, maybe Raja Ampat. My wife does not dive, so I am looking for upscale places for her to hang out while I play in the water.

Also, any beach resort towns in Indonesia or Malaysia that you would recommend a stay? Been to Bali, Lombok, Gilli Islands. Really liked Lombok.

thanks

Thaidive