As above!
You are a little vague on the third week and the reference to Puerto Galera. Is that the Atlantis property as well?
They often (correctly) use the phrase "Sabang Beach" instead of Puerto Galera because PG is actually 17 miles distant and has become major rat hole. Sabang Beach, at least at the shoreline "road", is quite nice.
That said- Hotel Atlantis Sabang is in my top 10 worldwide. Getting in 5x a day for the full week was a major hump- they're used to Europeans who don't need that much Nitrogen. The night time dive in the front of the place is the shiznitz.
Obtain and master a safety sausage, shooting it from 15fsw and hanging safely below, awaiting a pick up. Likely in the Philippines, you will always be with your guide, but stuff happens. This is a great time to put your initial on it with magic marker, show it to the boatsman- and let him see that it belongs to one of his divers. There can be a lot of sausages out there for them to pick from.
The Divi Flamingo on Bonaire is also my default go-to dive resort on Bonaire- It features the largest outdoor rinse tank. Stay out of the casino and go elsewhere to eat. The ramp to the shore dive can be quite slick if they haven't scrubbed it down.
Go to Bonaire and polish up your close-in hovering and observation skills. With the currents of Philippines, it may toss it all up for grabs, but starting in calm waters is the basis.