Sounds about right, I was in the same ballpark when I built my Swift.
Noticed you didnt have frame costs, presume you already have this
I went single speed initially, but have sourced alfine 8 bits for the next phase.
I would look to source good second hand parts, often these are at much reduced costs so it allows you to play/up the spec depending on what bargains you can find. Loads of bargains out there.
Mart