I repaired the power switch problem by just cleaning it. I did not remove the battery or camera, but did remove the small metal bracket just below the power button. I carefully used a contact cleaner spray and small knife to clean out some dust.

The power button now has the 'click feel' again and powers the phone on and off.