Looking for a 2.1 setup for music and home theater

A friend randomly offered to buy my current Klipsch Icon KF28 Best Buy specials and energy sub and I have been toying with getting something much nicer for a while. So here I am. 

I have a yamaha RXV477 that I will look to sell off as well to move to something better to pair with a new set of speakers. 

I’m mostly concerned with music listening. I have alll 16 or 24 bit recordings for playback from a current gen mac mini. I’ll be purely digitally sourced. I do not plan to add a turntable. 

I listen to jam bands, jazz, funk, downtempo/ambient, post rock, rock, 60’s-90’s stuff, bluegrass, some classical. 

The room is 15 x 20 with a vaulted ceiling. We rent here so I could, and likely will be in the next 6 months or so, moving to something without a vaulted ceiling. 

I’m looking for recommenced pairings for 2.1 speaker setup, amplification and DAC. Perfectly  okay with integrated amp as long as it’s a good pairing.  

I’m okay with buying used. 

Budget is ~$4k.