Two ways to look at it tho... you could have spent more by upgrading this stuff down the road vs doing it now. I like to try to do as much up front as possible. Price goes up quick but you have a better setup and half the work, cheaper in the long run.
I think you are doin it right... but I am a junkie too!
If you used that BAP it would knock off about $100 off (if you were asking for what it is worth... yours is cheap imo).