Congrats on a new bike, sounds great. Just an an FYI, our dealer sells Waterford, they are fully custom and simply beautiful, not cheap, but they can be almost as light as carbon and have an excellent ride. Gunner is the stock bike for Waterford, they come in standard sizes (although adjustments can be made for additional cost).

In looking at Rivendell, the stock frames are imported, while Waterford is all American made - this is important to some people. Also Rivendell doesn't offer a stock WSD frame, while all Waterford's are custom fit to you. If I were buying my LAST bike, I would go with Waterford, in the end I think a custom fit will be money well spent.