Yes. Ironically male! Catherine will end up in the same situation as her female counterpart's husband.
As for who can Arthur marry TTL...
https://en.wikipedia.org/wiki/Joanna_of_Naples_%281478%E2%80%931518%29 - THE OTL backup candidate for Arthur, older than him, may have issue from (TTL non-incest) match. If Spanish alliance is still in the card for Brits, Arthur'll marry Joanna of Naples.
Or we, as said before, can "butterfly balance" the events by having Miguel de Paz being born female AND his (her) mother Isabel to survive ordeal, and this way Maria and not Joanna marries to Britain.
Well, Arthur could marry widowed Margaret of Austria, 6 year difference is not a big deal in terms of dynastic alliances.