If you listen to rock then for most recordings you don't really want a very neutral speaker unless you tweak with the tone controls. I own a pair of N805s and they don't shine with rock although sometimes they surprise me.
I have listened to the B&W DM604s with built-in subs and they may be what you are looking for but since you own a pair of subs then the plain 604s should be fine.
I have listened to the B&W DM604s with built-in subs and they may be what you are looking for but since you own a pair of subs then the plain 604s should be fine.