I think that, rather than having a timer on the buffs, they should last a certain number of missions before they wear off.

It's ridiculous to do a mission and get a buff and then "Oops. I'm out of Energy!", so the buff wears off before you can do another mission.