Good stuff. The one thing I'll point out regarding the electronics is that there are a couple different tones which come from the 5-way rotary that are not achievable with the 3-way switching (the "in-between" settings which give spankier Strat-like tones.)
This fact alone had me go back to the original 5-way setup on my '94 CE24.
Just an FYI. Congrats!!