MoraBanc Classic and the Vuelta in 2013 both climbed Envalira without crossing a border.
Because of the weather, they didn't climb Engolasters and Baixalis after Comella this year. Comella and Engolasters is the combo featured in the 2019 Vuelta stage. Descending afterwards and then climbing Baixalis gives you the combo of the Andorran classic. Pal is even better than Botella to entice long-range action.
I have also played with Comella, doing it again, but in the opposite direction after Baixalis to have the same finish-line as in the 2021 Tour.