Ideally the former.
Trumpism is undoubtedly the future of the GOP, and America First is inevitable. The things that held Trump back were the fact that he caved in too much to the GOP Establishment out of fear of being called names that he got called anyways.
The fact is, policy-wise, the 2016 Trump campaign made the Republicans the more "moral" party. I'm not talking about Trump's personal life or personality, but on a more policy-basis, the answer is yes. A party which stands up for the working class's interests in terms of trade, lower taxes for the middle class while closing loopholes and deductions for millionaires, and an opposition to endless wars is a moral party. These are winning issues, the problem with Trump in many privileged suburbanites view is that they could turn a blind eye to this based off of the fact that his personality was "crude" or something.
The 2024 nominee may have to not tie themselves to Trump too much in a general (DeSantis for example) in order to regain ground in the suburbs, however. DeSantis will have to get better on economics for him to be my first choice, but either way, he will be a contender. Tucker Carlson would be my first, though him running is a longshot at this point.
Wait are you really the Election Prediction youtuber Red Eagle Politics?