That's weird, about the pickups being in the wrong place. Pics!
And, when you post them, you'll be Number 31!
Didn't get a good "before" shot before I started messing with it, but here's the work in progress. I bought an extra-thick, clear pickguard from WD to use as a fixture-tool to reposition the pickups into the right spot and investigate moving and re-doing the controls around.
In this photo, all the original screw holes for pickups and pickguard have been filled, the "J" bridge pickup cutout widened by 1/8" to fit the standard bridge-size J pickup.
These are the covers for the Fender Yosemite P-J pickup set to be installed, new holes drilled and mounted in much better alignment with the strings.
The factory had the pickups mounted so far left and up shifted that the E-string was a little beyond over center the second pole piece of the neck "P" pickup. They filed the heck out of the pickup cutouts in the guard to get it mounted.
Here's a closer shot of the original P pickup, camera angle makes it look better aligned than it was. LOL.



