B&W 604 S3 or Energy C9, Please Help!

I'm looking to buy some new speakers and I have a choice of B&W 604 S3 or Energy C9's.
I like two channel music, and love watching DVD's.
I will be using a Yamaha RX-2400 for amplification, and will likely have to wait some time for a subwoofer.
I used to own a pair of B&W DM 640i's, and was always pleased with how they sounded.
If anyone has any experience with either of these speakers, please let me know.