Home network setup recommendations

[Mytime34]

Hello All,

Here is what I have connecting to my network:

4 TivoHD's (10/100)
2 main I7 Pcs (1gb)
1 work laptop (1gb and VPN login to work)
3 Xbox 360's (10/100)
1 Wired printer (10/100)
2 Wireless laptops (G)
HTPC (1gb)
AT&T Microcell (10/100)
NAS SS4200-E WHS (1gb)
repair station (10/100/1000) depends on the PC I am working on

Here are my network switchs, routers etc:
Linksys WRT320N with 4 port gb switch
Linksys WRT310N with 4port gb switch (DDWRT setup as a switch)
8 port netgear gb switch
5 port cheapy gb switch
Belkin G router (setup as a switch)
I have a 24port gb Linksys switch coming in the mail

Here is how it is setup at the moment
1. Comcast Model
2. WRT320N Router - Work laptop, 8port gb switch, 5gb switch, Belkin Switch, Wireless (laptops)
a. 8port switch - 2ea Xbox 360's, 2ea I7 Systems, Tivo 1&2, ATT microcell, Tivo 4
b. 5port switch - WRT310N, Repair station
c. WRT310N - Tivo 3, NAS
d. Belkin switch - HTPC, Xbox 360

Here is how I want to setup my new network:
1. Comcast modem
2. PC running Pfsense or Untangle or ? - 24port Linksys GB Switch
(I have a spare PC that I can use as a router and I dont care about the cost associated with running it 24/7. PC is an X2 5600, 4gb ram, 500gb HD)
3. Linksys 24port Gb Switch - WRT320N, 4ea Tivos, 3ea Xbox 360's, 2ea I7 Systems, HTPC, printer, Repair station, ATT Microcell, NAS
a. WRT320N - Wireless laptops


I am trying to find the best setup/configuration for my home network
thanks for any help