[Sephiroth]

There is absolutely no doubt in my mind that the SH should be put into modem mode and you get yourself a decent router. RThe SH will never be wifi brilliant, none-the-least because it isn't dual-band wi-fi (it's switchable).

If you can do without Wi-Fi, then, as stated, Homeplugs are brilliant. But in any case, modem mode would give the SH less to do and keep it stable.