can't quite decide...
either what you suggest or a Dr and an infantry man for the remaining 20
or risk going short on numbers with either just a scout, rifleman or highlander
or taking the hit on stats too and going for a supernatural investigator
but this is my core