I think you're close, but 1) I think we're getting Dark Avengers, not Thunderbolts, and 2) I think they'll be setting up a Dark Avengers team that's an inverse of the original MCU Avengers.
Here's what we know so far:
Based on this theory, I think we'll be getting the following team:
For Iron Man, we don't know who that will be yet, but there is an upcoming 'Armor Wars' Disney + series with War Machine dealing with Tony's armor falling 'into the wrong hands'.