Get a slightly bigger, high quality British monitor speakers and pair it with a nice high current amp and you are set. Some recommendations:
Speakers:
1. Tannoy Sterling (not a bookshelf but behaves likes bookshelf), great speaker
2. Proac Response D2 or D15, D18
3. Neat Momentum
Amps:
1. Naim Nait 5si
2. Naim supernait 2
3. Plinius 8200 Mk2, 9200
Speakers:
1. Tannoy Sterling (not a bookshelf but behaves likes bookshelf), great speaker
2. Proac Response D2 or D15, D18
3. Neat Momentum
Amps:
1. Naim Nait 5si
2. Naim supernait 2
3. Plinius 8200 Mk2, 9200