Why not build your wheels now?

As for the crank, do you know what you would be getting? Unless you are changing the gearing, you are doubtful to notice an actual performance difference. I would figure out what you want and then just be real patient waiting for a deal. Ebay, bonktown, CL, british sites, you'll find it somewhere. Since you don't have an immediate need you can hold out for a bargain.