2030 Census should not count Illegal Aliens. That is a decision currently pending at SCOTUS.
Perhaps the 2030 redistricting should be more 52-48. Most will be competitive but deep red or blue states will have to have a few 100% blue districts for that to work.