New Office Buildout Help

[fldevs]

My company is gearing up for a move into brand new office and along with the headaches it will give us the ability to revamp the network setup.

I currently have:
FiOS Business 35/35
Watchguard XTM 22-W: Router, VPN, UTM Device
Netgear FS728TS: 10/100 switch
15 Workstations
3 Laptops
2 Servers

Want to upgrade to Gigabit and looking for any advise/help available. I am going to keep the Watchguard because we just purchased this about a year ago and love it. I don't think I need to get a full blown managed switch but was looking at smart switches.

Opinions:
TrendNet TEG-160WS x 2
Cat6 wiring throughout: in-wall, patch panel to switch and jack to pc (OVERKILL?)
48 port patch panel
wall mounted rack

Thanks in advance!