Thanks. Unless dissenting views are to follow I'll probably go with seat tube. Works better for hot coffee.
Still trying to source rivuts, and framesaver/amsoil mphd stuff locally, but will try to remember to return with pics once it's built back up.