Hey Bradders, where are you/your helpful builder man based? May be looking at a rebuild next year and this looks like a top job (and for less than the cost of the Torqen route). Understand you'd probably rather PM
If I were to do it, I'd go for strengthened internals in order to go FI at a later date (or at least have the option), so hopefully it'd be something different for the forum!