There's a difference between being a warrior on issues of religion and the family (what I call social conservatism) vs being a warrior on issues of national identity (what I call cultural conservatism). People who are primarily social conservatives by my definition tend to be less right wing on racial issues than people who primarily cultural conservatives are. Example: George W. Bush.
Trump himself is decidedly the latter. He decided to take up enough social conservative issues like abortion and SCOTUS in order to win both blocs of voters. I expect the GOP to be primarily cultural conservative going forward while throwing enough bones to social conservatives (who won't vote for progressives) to keep them in the fold.
Yeah, I think this is correct. It also seems like most religious conservative leaders have given up on trying to reclaim the party and are settling for some judges.