1 all the way. Keep incoming damage the same and drastically condense healing kits into stronger/more accesible skills. There's little chance that they go change previous fights, so trying to do 2 just seems impossible where as 1 is making a job that actually works in the current game state and fight philosophy.