I'd say remove Hop (or severely cut back on him), and give Marnie and Bede a few more encounters, because honestly, their situations are a lot more interesting and could tie in with the main plot of the game a lot more than Hop's thing.