Ok, I contacted my router manufacturer today as I thought HTC are not going to solve this unless they do another Android update, of which then I would have to wait for Vodafone..
Draytek replied and sent me a new firmware version to try, and touch wood, it seems to have fixed the problem, although this is using my GFs One X as mine went back to HTC this morning