Originally Posted by JohnDThompson

I'm not a fan of internal cable routing, so my personal choice would be to replace the top tube, in which case you may as well skip the Riv-Nuts and get proper bosses brazed in the seat tube.

Again, as long as you're doing some brazing, you may as well do the bottle bosses at the same time.