With #2 I desoldered the offending pads, confirmed that the pinout from the RPZ was good (it was) and reattached the switches.
I'm going to do a bit of troubleshooting on #3 with the power info you posted...thanks for that

Do you have a part number for the buttons?