Good stuff Fipsy.
The routing option is also viable and is one that even Fender has done, depending on the model.

Glad to hear you'll loop Adam in too. At least with a heads up he can check the rest of the kits from that batch are ok or not.