Nope, the real problem is the player.
If he does his buffing routine even when ambushed that is IMHO bad roleplaying and bad use of the mechanics.
I mean, while the rest of the party fight for dear life, good ole' Dwarf is praying round after round to buff himself up?
"Ooops, there goes the...