I think we should make it all 12, since the levelling challenges for having two optional ones and then the E4 might be more difficult than it's worth.

Chuck and Jasmine are already "bonus leaders," it's more a question as to whether he's fight-able or not. Since we don't have Chuck's Poliwrath or Jasmine's Steelix (their "signature" Pokemon), perhaps they would have to come in after the E4 and all that, when these Pokemon are introduced? That would at least reduce the factor of having two fighting leaders and we could replicate Chuck's old line-up and avoid too much overlap with the other Fighting leader (and consequently, Jasmine with Greyson).