You seem to have pretty decent parts. I think that formula rear would be better than the stock windsor hubs. If your frame is hi-ten, and you want an upgrade, you could just get one of the kilo framesets before they're gone and move the parts over.