YES and one more thing.....
Sit down and listen, what equipment makes you forget about time and place, what equipment makes you just want to put on another CD, and then another one and then another one....
This is about enjoying the music
My advice is to buy phase/time coherent speakers... I lived with such for 15 years... and after buying a set of such speakers there's no going back.... It may take you a while to realize why, but they provide more about the music....
There's not many that does such speakers
Some out of business: Dunlavy, Meadowlark
Some still in business: Thiel, Vaf, Duntech, Vandersteen, Audio Machina
Many people will disagree with me but that's fine, I'm just stating my opinion. I have lived with some small Duntech PCL-15 shoeboxes for a long time, and they may be the most magical speakers I have heard, because they're designed by the principles of Mr John Dunlavy..... Remember Dunlavy is the sole reason there is an A+ classification in Stereophile, his "Dunlavy model VI" speakers were so good that they broke all classifications once upon a time.....
You could buy a set of second hand Dunlavy Model IV from Audiogon, within the limits of your budget, it will blow away most speakers at any price......