Options to upgrade from Cambridge Integrated

I currently have a Camridge Audio 540A v2 integrated amp for our 2 channel setup. It is connected to some Altec bookshelf speakers. We will be moving to a new house soon and with some of the "freed up" equity I am looking at upgrading the speakers and possibly the amplifier. I don't have a huge budget but would like to have the upgrade be worthwhile. I am looking at Totem Arro, Vandersteen 2Ce's, B&W 603's etc. as possible speakers. The listening room will be mid sized and listening volume will be moderate. Classic Rock, Blues, Jazz are primary with a little Classical and Vocal as well. What are some possible options for a budget of $400-$600 (used/Audigon is fine)for the amplifier portion? My budget for speakers is $500-$1000. Source material is a Squeezebox and possibly audio in from TV, nothing else as we have a seperate home theatre setup already. Should I consider seperates or perhaps just a better integrated?