Gaudioso of Suéves - Origins?

Is Egilona as mixup with https://en.wikipedia.org/wiki/Egilona by chance?

I believe so.

https://www.newworldencyclopedia.org/entry/Umayyad_conquest_of_Hisp...

February 715—Musa ibn Nusair, Governor of Ifriqiya, entered Damascus with the Visigoth kings and princes and for the first time hundreds of western royalty and thousands of European captives were seen offering homage to the commander of the Muslims in Damascus. Musa the Conqueror of North Africa and the Iberian Peninsula died in Hejaz, while performing the Hajj. His son Abd al-Aziz ibn Musa was announced first Amir of Andalus and married the widow of King Roderick, Egilona Balthes. Seville became the Capital.