I agree, just kill everything in Moonrise Tower before the big fight, including Z'rell and you are good. She isn't really that good, she is only overpowered during the main fight.

"We are all stories in the end. Just make it a good one."

Doctor Who