They say practice makes perfect, so I think I might try throwing out different situations in class to give the students (and myself) some time to practice their problem-solving skills.
This is an excellent idea. We like to role play in class and without notice will be great to help them think on the spot.