B&w 803D-latest version vs Dynaudio focus 380

Hello everyone! Ive been meaning to upgrade my speakers for quite some time now and after starting out with well over a handful of possible choices, ive narrowed it down to these two and I was looking for peoples oppinions on what they thought was better. There specs, physical size and price are well within the same category. I listen to everything from acoustic clean folk music to country to hard rock and once in a while some r&b. This is a little more than I wanted to spend, so Im not sure if I can afford to get the JL fathom sub I originally wanted. What are your thoughts on these? With or without subs. Electronics are mcintosh ma7000 and oppo bdp105. Thanks!