Asia - MNL hotel advice wanted

My son and I are going diving in Puerta Galeria. The dive operation will pick us up at the airport, but our flight will arrive around 8:30 pm. I was thinking of spending two nights in Manila, in part to recover from the trip and in part to have a look around. From what I can tell there's not much for a tourist to do there.

My question is whether I should just stay in an airport hotel for two nights and go into town for the day we're there (assuming we can get up) or stay in town.

Some of the hotel info I've found on the web is dated--hotels have changed hands, etc.

I can't get any feel for the geography from the guide books I've consulted.

I also wonder if it would be easier if the dive operator picked us up from the airport rather than a hotel in town.

Any advice would be appreciated. I'm on my way out of the country, so I may not express my appreciation quickly or answer questions.
Thanks

The best area of Metro Manila is Makati. I'd start looking for hotels in that area, especially if you stay two nights.