Do yourself a favor, get some Ultegra / DTSwiss 1.1 wheels and use the rest to get a Phil Wood bottom bracket and Thomson stem/seatpost. Now THAT would be money better spent.

Or, alternatively, you could ride the relatively theft-free bike you have and put the money into your 401k. The best money is unspent.