Sorry to hear about your bad luck Will. Just one reason many of us have learned to kick back for a while after a new release.
In the end I think you made a very wise choice. I'll second what VTi said although I honestly believe that you cut your learning curve significantly by buying the right gear.
Luckilly in your case you chose to deal with a local shop so you were at least able to get things back on track ASAP.
Look forward to seeing some photos!
