Hello, welcome to geekhack.
Feels rough about the switch replacement, But that stuff happens a lot as a beginner (at least for me, I messed soldering on one of my first boards and one the keys wouldn't work)
Not knowledgeable when it comes to pcbs so I can't really help sorry. But hope someone else can.