Probably been suggested before, but seems to me the better solution would be to keep critical fail but for skill checks where the player don't have proficiency only.