I'm inclined to think that you've already examined the weaknesses of the mechanic and have it well in hand.  I will go ahead and try to toss you some extra xp for the week though.  I haven't seen positive energy surge in play, but it seems like a good mechanic, since it's at least not fully dependent in usefulness on what the GM is throwing at the party.