CHEWIE's would match mine pretty closely, though I might replace Ponda Baba with someone... Then again I might not, those are good choices.
I'm 100% not changing the Fleet Trooper, Tarkin, or Bom Vimdin.
I think I'd take Obi-Wan out (even though he's likely coming according to another Q&A answer), and slip in a grey Death Star Trooper. I bet we get him eventually anyway though.