Yes it applies to 7 as well, here is a slightly different method (assuming you haven't turned UAC off): »
support.microsoft.com/kb/299357When you say you did a factory reset, you mean you stuck something in the small hole probably at the back of the router and held the button down? Depending on the router you may need to pull the power while you're holding the button down and after you plug the power back in for 30 secs or so.
Scuba, Shaw likes to use modem/router combos these days and it sounds like he has one but he has never confirmed.
So you would need to phone Shaw to bridge the modem and test with just one computer plugged in. When done, phone Shaw back and ask them to turn off bridge mode. Pain in the ass but if nothing else works you could give that a shot.