I would second the recommendation for Velodyne if you are looking for a good sub for both HT and music. I have been using an HGS-12 with my N804s for many years now, and have been very happy with the setup. For music only I prefer REL, but my B&W are in the HT setup.
Mastering and 2 Channel: Wavelab 9/Bluesound Node/Pro-ject RPM 5.1 SE -> McIntosh C47 -> McIntosh MC452 -> Focal Sopra No 2 and REL S5/SHO (switchable)
Mixing and desktop: Cubase/Squeezebox -> Oppo HA-1 -> Rotel RB-1080 -> B&W N805 and REL S2
Theater: Oppo 103d -> Marantz SR7009 -> Martin Logan Motion 4/8 7.1 with REL S5/SHO
Living Room: Marantz SR5009 -> Rotel RB-993 -> B&W N804/HTM1 Rythmik F12SE