You don't have to keep claude in your fighting party. I thought SO2's plot was OK- you think the tournament ruined the plot? You are pretty early, stick with it you might like it more.