Looks like a good upgrade. Saving the HDD should be pretty easy. and if you are getting a new Desktop PC, it will probably have space for an extra HDD and you can just put it in the case and access the files.
Hope it comes soon or arrives early. You got 2 weeks left?