I came up with a simplified rework for this which should be much easier to do, and only requires 2 parts. All rework is on the top side, and no traces need to be cut.
It only requires a small 3.3V LDO and diode. I will post more detailed instructions and BOM once I get the parts.
