Keep the 540i or go to an M3 or M5. In the long run, unless you have to have X5 space, that's the best option if you want to drive what BMW does best. IN other words, getting an X5 is not moving "up" unless you mean moving "up" in maintenance costs while sacrificing performance.