Yup, that sounds about right to me.
I suppose another idea is to give the 25th the Anglo part of Bexar that Bonilla lost, in an attempt to bag Doggett, connected by a strip of real estate a foot wide, and leave the 21st largely alone. There may be a need to switch around some of Anglo Bexas between the 21st and 25th to do that. And of course, if that is done, the Texas Dems in the legislature will be back in Santa Fe, which is a great place to be in the summer.