Things are never simple with BMW. The devil is always in the details of any "simple" solution. Back about 40 years ago before the complexities of computers, interconnected modules and software nuances I found that out with a "simple" (There's that word again.) engine swap. 6 weeks later I got the car back on the road.
Stick with swapping like for like unless you have the facilities and resources to make drastic changes to everything concerned.
GL.

__________________
Sent via Telegraph Wires using my Morse Key.
2021 X5 xDrive40i
2015 X5 xDrive35i MSport
(Traded) 2013 X5 xDrive35i