I did exactly what your doing a couple of year back everything new or recon from engine and gearbox with the disco trany (makes a hell of a difference on motorway) 130 heavy duty clutch slick shift etc standard brand new take off suspension bushes roll bars, full 110 discs and calipers lines etc and got to say it drives like a new one. Anyway my rear wings were in good nick but bubbling so because I opted for a TD5 galv chassis I found a nearly new puma full rear tub and dropped in a TD5 tank so mine is pretty much a ROW spec now and I like the look. Bonus is no more rusty fuel tank slushing about under your arse. Just a bit of food for thought, I'd also save a couple of grand for a decent paint job after your hard work its worth it, I went for santorini black.