bi or dipole

So I've been working on getting my home theater to as "perfect" as I can get it... until I decide to upgrade again. Currently I have Jamo speakers all around, 5.1, S60 Center, S606 Mains and S602 rears. I've been looking to upgrade to a 7.1 setup since I have the space and was wondering what...