Sports clubs and diving sites - moving to Manila

Hi all!

I'm moving to Manila next week and will be looking for an apartment in Makati city, preferably in Salcedo village. After I've found a home, I'll want to find a nice gym nearby. Any recommendations?

I'm also a diver and really excited about the diving possibilities in the Philippines. If anyone wants to share their tips for great diving sites (especially ones that can be visited from Manila without flying during a normal weekend) I'd be happy to hear! Buddies are welcomed as well :)

Thanks in advance,

Outi