I would go for the latter, passive+amp. I would hold off on adding a sub right away and wait until the speakers are fully run in and optimally positioned which takes some time. Keep in mind that Hegel just replaced the H390 with the H400. I did an A/B in my house of the H590 vs. H600 and the H600 was a BIG step up in SQ. Better preamp section and better DAC.