They already rely on your 2nd point quite a bit between KERS and DRS. The former stores brake energy for a speed boost and the latter reduces drag on a straight to improve top-end speed. They haven't helped much.

https://en.m.wikipedia.org/wiki/Kinetic_energy_recovery_syst...

http://www.formula1-dictionary.net/drs_wing_rear_movable.htm...