I've just spent a bit of time (when I should have been doing real work) looking over everything.
I have decided to have another run at it with these templates, but I am going to move everything about ~20mm further into the body and stick with 24 frets. I think I can achieve that fairly easily, I'll just bite the bullet and buy another router bit to do the radius's in the neck pocket with. Will be cheaper than re-ordering templates.
There will be a slight hiatus as I am away this weekend, but I am going home, which means I can dig around in my Dads under house storage - I might get lucky and find some nice wood to recycle in there.