Certainly the Revels if the price isn't a problem. I'm quite a fan of B&W, but the F30 compared to the 604 isn't really a fair fight. The CDM9NT would be a more fair comparison, or maybe a set of old Matrix 802's would be a nice find. Unless you're a cursed equipment nut (I'm certainly not) you'll be happy with whichever one once your ears get used to them.