I would think you might want to consider an integrated tube amp and a pair of single driver speakers. They would be wonderful for the type of music you listen. Also, do you listen to LPs and/or CDs? CD players have improved quite a bit over the last 20 years so replacing your current player should be considered. If you play LPs, you need to be aware that a lot of preamps/integrated amps do not have a built-in phono preamp.