One of those new NiCad powered engines for each axle, independently switchable would be ideal.

Seriously on HPTV they talk a lot about the availability of the newer GM short blocks with all kinds of goodies that make plenty of power and get great mpg, but it is an extensive swap.

I think with new O2's my engine should still have lots of life left in it.