Re: Netgear - BTDT, had several that worked fine for years, then just didn't work with the Mini anymore.... It's a problem with the router, some of them don't confirm EXACTLY to the spec. For all other systems, it's not an issue, but for the Mini with 10.6 and certain updates, it's a problem. It's even more of a problem because if you take it to an Apple store, they will plug it into their Cisco gear and tell you there is nothing wrong. The only real solution is to either do a clean install of 10.6 and never upgrade, upgrade to 10.7/8/9, or get a switch that is conforming to spec*. Wy wife has the exact same Mini as yours, had the same problems which went away with the Cisco switch install...
Based on your network description, you actually already have a backbone-based system. In this case, either your Vigor or Netgear WAP is the backbone router. I have roughly the same setup, with even shorter runs. I found my old main switch (also a WAP/router) was becoming saturated when running at full speed, causing lots of dropped packets, slowing everything on the network down. Hence my upgrade, now I have: internet modem/gateway -> WAP/router/firewall -> core switch -> local switch. All of the 'server' stuff hangs off the core switch (NAS, video server, etc) and all the 'desktops' are attached to the local switches. We have something like 15 devices on the network, wired & wireless, everything pretty much runs at full speed.
Finally if 'very tidy' means in the walls/floor, then you have it easy, you can mostly likely pull new wire with few issues as it's unlikely to be attached anywhere other than the outlets. If it means 'stapled along the baseboard', forget it.
*ps - all Gig-E 'hubs' are in fact switches. Hubs only work upto 100baseT. The main difference between cheap & more expensive switches is generally management capabilities and better hardware.