I use Bubble Magus products. They are very good. that said, you really aren't upgrading by very much moving to the Curve 7. the air draw of the pump on the C7 is 450L/H, and the pump that you have on the Octo is 420L/H. Not much of an upgrade.
I would jump up to eh BM 220A and about double your efficiency.