Quickest and simplest streamlining? Just have Composure be an ability score that you roll for/allocate just like any others, similar to Sanity and Honor scores from the DMG optional rules. I see no really compelling reason for it to be a secondary derived score.