I don'r really follow. Rebuild sounds attractive, but wouldn't I be left with precisely the option I'm trying to avoid?
A cleaner and more reliable IFR-equipped big thirsty tank is still a big, thirsty tank.
I don't know many people that believe the oil price will fall over the next decade. If 30-40 litres/hr is expensive today, imagine what it would work out at $120/barrel.
I know of one chap with a well maintained 161 who paid £4k just after Part M came in. What sort of prices are people experiencing now?
That and a bit more is ballpark for us.