True, I don't think making the watch less reliable, or straight-up busted, is a bad idea. Yotsuha did get rid of the most immediate dangers to Uichi's life, and he himself seems more stable now.
I just think there's only so much misery and despair you can throw at one character before it starts...