You would be best to go with the B&W for your front. It would be a better match in tone and balance to the front. That is of course that you will want to hold onto your 804's. To the remark by one that they did not see how someone who makes speakers in his basement can not make a better speaker then B&W and the likes. Most all highly reqarded products got there start in someones basement or small lab. It is the whole concept of building a better mouse trap. You don't have to grow your own oranges to sell good ones. By the by, I have both VSA and b&w speakers.
Von Schweikert LCR-15 or B&W HTM2
I have B&W 804's in the front and von schweikert VR-1's in back , trying to decide between the HTM and the LCR. Obviously the HTM is the match however I can get the LCR for a better deal, thoughts?