The Mergui Archipelago in Myanmar with a trip on the mainland (Bagan, Inle Lake, Yangon) is a nice combination.
In the Mergui Archipelago there are great dive sites like Western Rocky, Boulder Rock, Pink Canyon, South Twin, ....
There are a few resorts now which offer Scuba Diving.