Brendan, I fixed the cup holder problem by using a 1998 to 2003 Jaguar XJ8/XJR centre console lid that has a retractable pair of cupholders built in.
You loose the ability to lock the storage compartment and its a bit higher , but other than that its a pretty good fit.
No photo of mine yet, but this nice DB7 VV that has some AM works service options has one that is obviously the Jag one also.
I had to dye the leather on mine to get a colour match to the interior, but you could just buy a black one as some of the XJR interiors were that colour
https://www.youtube.com/watch?feature=player_detailpage&v=WHIoDnsv684#t=77