re. You'd have to find somewhere to put bloody big tanks if you want long range.
I would offer a BRILLIANT solution to the problem: put the bloody big tanks BEHIND the front unit (aka loco), and it SHOULD be able to pull them, all (up to) 800 miles.