Fortunately yourchoice of musicis about the least demanding of all when it comes to hifi.
Looks like the best thing to do is sell your existing amp/CDPfirst which will give you a total budget of at least £800. The speakers should be ok for now. (Obviously this will mean going without a system for a few weeks till you've got everything sorted).
For a genuine improvement in sound you'd still be looking at secondhand gear but £800 shouldjust be enough to do the job. As already suggested, look out for Naim, Exposure, Creek, Rega, Densen etc. Another possibility is Cyrus - their kit tends to have the lively tonal balance and sharp timingthat would suitdance/electronica.