I think the embassy might take a dim view of dive professional training though, since it implies the possibility of working in Thai dive centres. In the press release for the DTV, Muay Thai specifically was mentioned as sporting activities.
Scuba is not officially one of the "soft power" categories on the DTV, so it might not be accepted. Have you reached out to your local RTE for the requirements? You could potentially do a medical appointment then cancel it.
I can say for Singapore, as a Singapore citizen - the thai embassy in Singapore only issues visas for Singapore citizens and valid long term pass holders.