No thanks, I don't think Hagakure should return back to its original form. The problem just lies with Shoha doing nothing outside of phase changes.

Instead, how about we give Midare a stacking buff that makes Shoha active at three instances of it? That way you would have another button to press after Tsubame just in case Senei is on CD.

Or that way SAM just has an even bigger burst every 2 minutes.