So thanks to everyone for your suggestions. I've decided to keep the NP30 streamer and will focus on amp/speakers. Budget probably a little reduced, maxing at £2500.
In a couple of weeks I'll be auditioning the Naim Nait 5si, Rega Elex-R, and also, on recommendation from my local shop, the...