If enough people complain this fight is too hard Larian will probably "fix it" by putting some oil barrels down there.
The worst part is the dragon rider speeding off for no reason when combat starts when the logical choice would be to feed the party to the dragon. It's like they only wanted to show off with the dragon early.
