You've already got the NF7-S, so why not get the Ultra Infinity?
It's a damn good board with enough overclocking options to 'choke a hoss' and routinely gets higher bus speeds than other manufacturers seem capable of delivering.
It also has digital in as well as out (soundstorm), if that's something you care about, and the best four channel onboard SATA controller availible (SiIG 3114).
Plus the DFI has 4 back panel USB ports so you don't have to use an ugly pci/motherboard usb header deal.
The passive northbridge heatsink will cut noise down, and in my experience, allows surprisingly good overclocking (if it has full thermal paste contact).