Suggest finding a local audio club, get out and listen to lots of gear, although what you've got is nice (I own a NAD M10 and also primarily stream).
My first advice is to evaluate your listening space. Is it tiny, square, un-isolated acoustically, and shared (can't develop ideal setup, listen when you want, or add needed room treatments)? If so, recommend headphones for serious listening and a "family system" in-room.
When auditioning bring a variety of your favorites, limit yourself to 3 or 4 pieces of the given type (speakers, amps, etc.) per day staying with the same ancillaries/room, and take notes (auditory memory is fleeting and it will force you to critically listen). Shows are only good to chat with vendors or veto certain pieces/manufacturers. Final auditions should be at home.
Be aware that most audiophiles are trophy hunters (who impulse buy and then swap too often and want to show off their gear). They also shop far too much with their eyes and not their ears (note Salk's very nice veneer).
Your classic Klipsch speakers are very efficient, but of ancient design. Modern speakers offer many advantages. Hear for yourself. And read up here at Audio Circle.