Have to say I agree with you on your choices of upgrades, although I did go for instant supply depot's. I've been caught without enough before, especially in the early game if I'm not paying enough attention, and having them drop instantly is pretty nice since it doesn't tie up an SCV or two for a good chunk of the game. I can just use the same ones I use for building defenses without having to take them away from repair or bunker building duty for more than a few seconds.