I've owned a lot of B&W's, altho not the 804's. They tend to like a lot of SS power; & I'd think either of your choices would be very good. Plinius could also be well worth checking out.
What's your budget? And new or used?
What's your budget? And new or used?