Making him a proper companion, with a romance arc that starts in Act 1 like all the others and not just someone taking up space in camp, might even fix some of those Act 3 issues. (Or make them worse, but one could hope.)