Looking over your choices, I see some unavoidable compromises.  Both of those Wharfedale speakers are a little low in sensitivity, so I would not be happy using a 35 WPC PM5004 in a large room at higher volumes with either speaker.  On the other hand, I like my money to go towards sound quality as much as possible, so unless I really needed a tuner, I tend to stay away from receivers. Same thing for the CDP. A changer is money spent on a feature that doesn't add to the sound quality, so I choose single disk players.

But I realize that a tuner, and changer have value to other people, and each of us have to make your own decisions.  With all that being said, I don't think I really understand why you think the more powerful amplifier, and CD changer was not the right choice for you. 

One thing I try not to do is look back too much, questioning my choices. I have enough stress deciding on what I'm getting next. I try to keep in mind that there really is no perfect component for me, once sound, features, and cost are all considered, so after making a purchase it's best to move on in a way. I just try and learn as I go, and maybe I'll be a little smarter the next time. It's all part of the game/hobby to me, so I try and enjoy it while listening to some music. I'm in it for the long haul.

BTW- I have a phono stage, a Pro-ject Tube Box II SE at home on demo that I'm listening to at the moment. I can tell you right now, even before I buy it, that I will be/am having thoughts about competing products that I maybe should get instead, but that kind of thinking can go on forever with me. So after buying it, I will enjoy listening to it while pleasantly pondering future buys. (Confessions of an equipment junky.)