Honestly, CVAP is the correct answer here. It makes no sense to base redistricting on people who are not allowed to vote (this should also be true for reapportionment purposes).
Regardless, the whole idea of mandated majority-minority districts, regardless of compactness and cohesiveness of communities, has been an utter failure for the US political system.
Switching to CVAP would be a bonanza for the Republican Party, you know. And even besides that it would be morally suspect: even if immigrants and children cannot yet vote, they are still full human beings deserving of consideration, and are still affected by this policies of those who
do vote. (Mind you I would like to see the franchise expanded to 16-year-olds, green card holders, felons, etc. That so many residents of America cannot have a say in its governance is the real problem here, and switching to CVAP is the exact wrong tack to take.)
One man, one vote, based on total population, is a moral imperative. The Roberts court better not engage in a naked partisan power grab and tear it to shreds.