In regards to speakers, I found over time I rarely use speakers and are thus happy with a rather basic set (maybe not quite as basic as OP). Headphones is where I prefer to put the majority of my audio budget.
Although it looks like OP does know what he is talking about and gave options for higher quality speakers if one wanted them.