Yessir, I think you're making good choices there.
For what it's worth, those PSU calculators always overstate your needs. That 1200W will be just fine.
There's some good advice above about the EVGA B-stock. If you're not concerned about warranty, you can do that and save a good chunk of change. Did the discount at Fry's thing work out for you?