Just those 2 things could POTENTIALLY run into $2k, not to mention the stuff you'll have to to do "just because".
Sounds like another parts rig that needs fixin'.

I can't shake the idea that you should just save money and wait for what you really want to pop up, and it will do just that, "Pop Up".
Mark.