Need help - what equipment to buy?

[Grit]

I need some equipment suggestions. My biggest concern is being able to stream media off the WHS (or NAS) AND backup speeds across the network (both wired and wireless). I want all wired gigabit capable.

So, media box in garage will have five CAT6 cables:
1 goes to - entertainment center (includes TiVo x2, Sonos, Oppo Blu-Ray, and Pioneer tv)
2 goes to - office (includes printer, desktop computer)
3 goes to - WHS box (on shelf above box)
4 goes to - unused outlet (may be used for LAN parties or other occasional use)
5 goes to - wireless access point in the attic (connects to Wii, 2 laptops, smart phone, etc)

#1 & 2 will need switches (obviously).
I need a router in the media box.
I need a wireless access point in the attic. I do not need dual band, but do not mind if dual band is included.

I want to make sure the hardware isn't slowing stuff down at all.

My current router is a D-Link 655.
My current switches are D-Link "green" gigabit switches.

I need either a new wireless router or a wireless access point (and I should be able to use the D-Link 655 as the other, right?).

My biggest concern previously was VERY SLOW bare metal restore times off my WHS box (which is running 2 GB ram on an old Intel Core 2 duo CPU). It took over 8 hours to restore a 200GB SSD!!!

So, can someone please point out the weak spots in my network and suggest some new equipment to fix it?

Thanks!