Well have just done the deed!
Left BE (a bit sad since they were reliable for the 6+ years I was with them!) and signed up for Infinity 2.

Estimated speed is 65Mbit down/20 up and activation/installed scheduled for November 9th.
Hope it all works out OK! Plenty of time to shop for a new router as I don't intend using the HH3, I need gigabit ports and I discovered it only has 1 or 2 which is a bit pants...