You are correct.
I think there have always been at least two main factions, the economic conservatives and the social conservatives. Sometimes united in either a person or a policy, but there is a Venn diagram that could be drawn with Evangelicals being one circle and free market and libertarians being another circle or two.
Perot and Buchanan revealed, and Trump finally harnessed, a third circle: a pro-business nationalism that I would characterize as socially traditionalist rather than socially conservative (in the sense of ineffectual movement conservatism). It is populist, which I define as against the rule of the transnational progressive corporatist elite.
Although there are some academic centers for this revised right (e.g. Claremont College), it’s largely em
erged outside of academia and traditional seats of power.