And now, because I know there are so many Ollie fans out there:

I keep trying to think up alternatives for the Stuart Townend ’till on that cross…’ bit.

So far:
‘Till on that cross, as Jesus groaned, the wrath of man was overthrown…’
(which induces groans of its own)

or
‘Till on that cross as Jesus died, the nature of human anger was exposed and deposed…’
(but that doesn’t really scan, does it?)