The name Jaime certainly seems most like the English name, but on the other hand I can see that “Diego” descends from “Jacobus”* through variants such as “Iago”. But how did Spanish evolve the variant “Jaime”–and how did we get “James” in English, in the first place?
*“Jacob” being the original name from which “James” descended.