You seem to be keeping the budget in mind, which is essential. My current project has blown its budget to pieces, mainly because I bought a bunch of stuff for the bike to make it "better", before I had my budget outlined. In truth, I didn't have to replace the wheels or crankset for the bike to function. It was a matter of selecting lighter, higher quality components, with a bit of aesthetic influence thrown in. Had I made the budget first, I would have made different choices, considering it needed cables, bottom bracket, saddle, tires, grips, etc. In the end, this bike is a gift for my daughter. So I can justify the expenditure based upon that. But if I were flipping the bike, I'd be in trouble. Do keep us updated.