OOOPS! Got to re-work the conversion project

I got a new wiring harness in.  The problem I now face is that the pots on the new harness are much larger than the old ones:

This means I have to move them up (towards the strings) just a bit.  But there is no room for the 5 way switch if I do that!

Here is one possible layout (thanks to the magic of  photoshop-ignore the “cutouts” on the right of the picture- used those to copy and paste!):

I did have a few dings to fix in the body, so I am taking adavantage of this opportunity to do that.  First step, of course, is to fill the old holes and sand down the body again.  here is stage one:

I will keep you updated as I move through the re-work!