If you reckon it'll cost £30,000 to complete in minimum hours/time, it'll probably cost £40,000 - £45,000 by the time you're done.
Your Test fees and Licence/Rating issue fees appear to be out of date, not that it makes too much difference.
However, to illustrate both points, the test fee for the CPL is £607 + aircraft hire for 2-2.5 hours = not far off £1,000; "partial" your test and you'll pay another fee of £406 plus another hour or so aircraft hire. Do the same on your IR Test and the sums will be even bigger.
Overrun on your IR training in a twin by only 3 hours and you'll have spent the best part of another £1,000....and so it goes on.
I would bump your figures up a bit.