Call Waterford and ask them to make a Gunnar Roadie with full race geometry.

That would save a few bucks.

Putting lugs on the bottom bracket for all the tubes would increase rigidity down there.
The weight cost would be small. I have that on my bike, and it seems to help.