New Amp to replace Onkyo TX-SR605

hi

i currently have a samsung 40" LCD 5 series which i will upgrade in the future but for now i want a new amp to get ready for 4k and 3d and more hdmi inputs and also networking.

is the 609 the best amp for £400 at the moment?  i popped into rayliehg hifi in chelmsford and he said that he doesn't rate them against denon's the new yamaha's and a canadian company which i forget the name.

i also want to stream through homeplugs music and movies through the amp if possible.  i have an xbox 360, ps3 and foxsat hdr box which i want connected up to.

my surround speakers is a 5.1 tannoy FX set which i got for £170 a few yrs back but i'm not overly impressed with them.  i may go down the route of floorstanders and nice centre with rears.

what would be a good setup for £600 inclusive that would beat what i have now?  i listen to music via an ipod which sits on a dock station/speaker at present but will purchase a new record player in the future when i move home.