I was predicting a Warren vs. Harris primary around 2018. Usually I predicted a Warren win, but given her performance in the actual 2020 primaries, I'm not so sure she'd do well even if she had a lane to herself. In any case, here's a Warren map.
President Donald Trump (R-FL) / Vice President Mike Pence (R-IN) ✓
Senator Elizabeth Warren (D-MA) / Senator Tammy Duckworth (D-IL)
On the other hand, if it's Harris or Buttigieg, I expect a map pretty similar to Biden's. Sherrod Brown would get a map like Sanders'.