Looks like they did eventually fix the F5 battery drain so hopefully they can learn from that and get a more rapid solution for the F7. Or, as you say, a CM ROM will also work.
Just noticed the QHD 7 is available to pre-order at Tmall and looks like it'll be available end of this month, so I'll definitely be spending a few hours in a local Oppo store (I'm in China) to give it, and the 7a, a good once over.
Ah .it would be so nice to walk into a Oppo store! Checkout the F7, F7a and all the accessories. Like the O-Click ..that looks interesting!
http://oppostyle.com/accessories/52-o-click.html