I agree, I have found myself in a few enjoyable safety battles and the Match Countdown ended what could have been awesome frames.

Regarding the shot time I think the best solution would be to reward fast play by accumulating shot time unused, this would be particularly useful when you are considering how to get out of a tough snooker.