Have you tried reloading the game?
I've reloaded few times. I think at this point I'll just wait for the next patch, because now Wyll's dialogue is not triggering properly. I coukd deal with the combat, but if his interactions are also bugged that's just disappointing.
