I'm a firm believer of closing off a saga if I've started it so here's the update on this one for anyone following or reading in the future...
I've just picked the car up (it's been with the dealer since I posted as much on the 6th, my spare car also broke shortly after so we've been on the bus for a couple of weeks) and following some polite backwards and forwards with Citroen customer care they accepted that this is a common issue they're aware of, have attempted to stop the issue with the updated vented cap for older cars and that they've redesigned the tank and some of the bits fastened to it since then in order to help stop these issues happening. As a result of this they agreed to cover all costs associated with this for me, even the initial £144 diagnostics.
Citroen dealerships apparently aren't allowed to steer customers in the direction of Citroen as it's deemed to be generating their own revenue but they are aware of the issues and know that Citroen usually help out with costs.
Neos Brothers have the new tank available for under £700, based on my invoice Citroen can also get the part for around this mark despite originally quoting me £1000 plus VAT for it so if you do have to buy one please haggle with them!
It's been a roller-coaster of emotions from the initial errors and worry about getting my family home, the initial "extras" on the health check winding me up, the quote of £2000 and the delay in getting the car back but all said and done Citroen themselves have rescued the situation well, I just wish they'd hold their hands up, issue a proactive recall and get all of these tanks replaced with the improved one so that nobody ends up having to pay for the investigations and repairs themselves in the future.
On the plus side when I come to sell the car I can advertise it's had this done and hopefully that will make it slightly more appealing, for now I'm just glad to have it back so we can do things again... like pick up parts for a broken Saab
Hopefully this helps someone in the future, if one person benefits from my ramble and doesn't have to pay for this then I'll be happy.