Personally, the 540i. I LOVE E39s. I had a 528i, and it was great. I also LOVE the styling. Probably one of the best looking BMWs, behind maybe the E38.
Coming from an X, you'll probably appreciate the 5's more spacious interior.
Good Luck!

__________________
T