I'd wager an expanded trait list (adding some from earlier games perhaps) will be one of the first mods we'll see.
Good natured is a great pick even for a combat character, provided that you won't use too many weapon types. For max. benefit you'd want to stick with just one type, but that might be too restrictive. Still, even if you used, say, energy weapons and explosives, that'd still be a +15 skill bonus.
No-brainer if you ask me since the benefits provided by the other traits aren't really worth the drawbacks (WW excepted, of course).