I think it's fair to say that you jumped into the deep end of the pool head first. However you've gotten it all out of the way up front and should have no issues other than some fine tuning.

I wanted to say that you spent way too much but other than having a shop do the initial repairs other than doing it yourself I can't really fault any of your costs. A bit of nit picking here and there perhaps on buying one more expensive brand over another cheaper option but on the whole and for two bikes I think you did well and presented a realistic budget.

It's great that you also factored in a spare bike. I know that having more than one has helped me out a lot when one goes down for whatever reason. Gives you an option to ride to get parts or just to delay any repairs for a day or two if you're doing other things.