If i recall correctly you have two choices after you visit the city where the Hendrik was. Bloody Baron or "Hunting a Witch", i went with Hunting a Witch first. And when i was done with Keira's entire chain of quests (side quests aswell), i went to the Baron.
As for gear im still using the Viper swords and the DLC armor from the prologue. Every schematics iv found so fare are level 14+, annoying!.