OMG, you sound like a peofessional luthier.
This amount of fix would worth for a rarity or CS Fender, but for a Squire - one must enjoy the challenge.
Actually I would also try just like you do it, though I have less skills, surely.
I hope you will fix it and also follow this with high interest...