Don't see the avant going any time soon tbh, does everything I need from a car and still makes me smile every time I see it and drive it.
Probably a combination of the two although focusing on doing the basics first.
Got the engine water and oil tight, new radiator, oil cooler, coolant pipes, water pump, thermostat and sump gasket. Front panels cleaned up and repainted so it's looking a lot more presentable under the bonnet.
Now working away at one area that was causing me the most concern, rear end drive train and subframe.
Diff took forever to clean up, oil, dirt and grease all mixed together everywhere but all done now with new shaft oil seals all round and currently in primer just waiting on final top coat. Got lucky with the subframe as it looked 100x worse than it actually was so that's been blasted, zinc primed and powder coated. I'd initially thought the body underneath was in great shape but the exhaust shield was hiding and I think causing a fair bit of corrosion. I'm pretty sure where the aluminium meets the steel it's causing a bimetallic reaction as the rust seems to start around all the mounting studs. That was a horrible couple of days stripping it off but luckily the rust was light enough so I was comfortable just treating it then zinc primering, nice coat of Gravitex then some silver POR15(great paint!!).
.
Bought some super rare BBS forged wheels, thought I'd won a watch as they were supposed to be the right stud pattern but predictably they weren't the 4x108 I need and turned out to be 4x100. Luckily I'd bought new hubs so took them to work and redrilled and tapped them to 4x100 so I can still use the wheels without shelling out for adaptors.
Just slowly working my way round all the various arms etc cleaning, painting and fitting new bearings, joints and bushes, actually ended up buying a proper hydraulic press as there's that many to do!! Ordered some KW coilovers so hopefully can start rebuilding the rear end soon then on to the front. Still enjoying it but seem to spend more time researching and trying to find parts online than I do actually working on it, luckily I'm in no great rush.