Not wishing to be the merchant of doom and gloom, but wouldn't it be better to get all the mechanical mods sorted first. Wont cost a fortune but small mods like EGR, de-cat, checking for oil on the loom etc. little things that will catch you out at some point. It's fine to do visual upgrades but...