I would recommend having a chat with the guys at Swallows. They specialise in the more modern Jaguars and know the XF inside out. An email over with your requirements will allow them to recommend the best for your budget and useage.
I know from experience they really helped guide me buying the right XF.
The XF is streets ahead of the X-Type in terms of car (I'm not knocking X-Types, they were great cars of their time, especially the estate), the Sportbrake though is a very good all rounder which ever engine you go for.
Contact Tom direct on his email
tom.robinson@jec.org.uk
They are extremely busy at the moment though, so there will be a delay in him replying.
Cheers
JB