My one run through that made it past the battle, I could get Shadowheart, Wyll and Astarion (still bugged?)

Not related but you can also play without meeting Gale now.

dumb, pseudo-intellectual and polite homophobe