The Pro+ has definitely been a blessing and a curse, I prefer the built in screen but cant stand the limitations, FB being the most obvious. Will definitely have to check out the offline maps info, thanks for that!
I used a heatgun and was able to re-flow the solder on the charging controller chip and it helped but did not fix the problem. Will be replacing the battery shortly to see if that resolves the issue fully.