Wow, that's alot of stuff to consider. For 1K it might not go that far on a whole new setup. I think you'd be better off keeping the good parts of your older system and build around that. Only buy what you are in absolute need of and use the unused equipment for the bedroom setup.