I'll test out that Workgroup theory later today.
Regarding the other idea, is this what you are talking about?
I've fiddled with that and so many other things, and am always left in the same situation. If my router was a switch or a bridge I wouldn't have this problem. I really wish more companies who make routers would allow you to configure them as either of those things... it'd solve my issue right there.