I wouldn't bother buying new homeplugs as you have already established they are not the problem. Wireless on the shub is absolutely pants and you will be doing yourself a huge favour if you put the shub in modem mode and buy yourself a proper router like this
http://www.amazon.co.uk/Linksys-EA27...linksys+ea2700