Limit surface effects to natural 20 crits. That would fix much of the balance and make crits more fun.