Get the 2005 if you can handle the price increase. Jag kept updating with big and little changes giving better performance and smoother handling. You love any of them but the later model XK have a 6 speed over the 5 speed. That extra gear makes a big difference.
Jaguar warranties are not expensive compared to good aftermarket warranties. Is that the 8 year/100k Jag warranty you were quoted?