Here's the layout I was working on when you phoned:

And with labels:

These aren't perfectly aligned, just placed for rough assessment. Obviously the extra knob and washer on the neck are not part of the scheme, just what I cut and paste for the other controls. The only slightly weird thing about getting the extra controls in is the jack placement. Normally, the jack would swing down about 30 degrees from this placement, but as you can see it takes up a good deal of space. Let me know if something like this looks good to you.