Thorn, with respect to your current bike, sounds to me like you just need new wheels. Or maybe your old wheels just need truing.

But of course you need a new Waterford too!