I like my dynohubs (have 3 of them!) but they are a "nice to have" for me, rather than a "need to have" when it comes to brevets... but I like them best on my commuter. I think the best value is adding some good battery lights to the velo-routier kit. You'd still be well under 2,000$ by the time all is said and done... if you wear out the tires you can keep the used front as a spare when you buy new compass ones. The nice thing about keeping the toussaint bike together as a whole is that it'd be easier to sell if you want to move to a custom or go in a different direction after a year or two of randonneuring.