Contact GrahamL, he can reset your 2nd ECU box back to its virgin state and accepts your code box, so you don't need to change the code box, and full set of locks.
Yes - changed out my ECU. Used a company in Nottingham. Can't remember the details, but I think they supplied it uncoded, and then gave it to the garage with all my keys. They then programmed the ECU and re-programmed the keys, or something like that.