Add Gjallarhorn to what you have. You don't need more power in small rooms and shop for passive speakers, less expensive to uograde that way.