Rathma's golem fight is still bugged

I'm just getting around to playing the campaign this season, as real Iife has gotten in the way. I got to the Rathma's golem fight and it took me about 5 tries, as I couldn't even see the one shot mechanic half of the time. Only then for the game to stall out after I get back into my body.

I saw posts from a month ago talking about this bug and am surprised it still hasn't been fixed. I honestly almost gave up completely because it tool me a while to beat it.

THE FIX: Dismiss your mercenaries, after you get back into your body do not use an attack. The fight is over just wait for it to end. I did it the second time on normal to run through it and didn't have an issue. Blizzard be better please.