That chip shortage pain is too real. I got stuck waiting on a simple USB port controller last month, so now I keep a few of those and common charging ICs on hand. @shane_hayes has the right idea with the basic repair kit. My bench drawer has little bins for the parts that always seem to die, mostly salvaged from old boards. It doesn't fix every wait, but it cuts down on the small annoying delays.

That sounds like a special kind of pain (I feel for you). Good intentions really can lead to the worst jobs sometimes. Sanding that off is going to be a long, boring process.

Check the back neck seam, always goes first.