If you can afford it, do option 2, now. No doubt. For the extra $600, you won't regret it.
It's going to cost me a chunk of change, but I'm doing my best to get my garage done the way I want it, before I move in. Doing projects a second time, or the first time, after already moving in just *****.