Scottie - Hang on in their mate, you are getting the car you want, the way you want it.
Despite all the extra work, there is no way you will be missing Stoneleigh 2015.
( Provided you don't take a chainsaw to the car when you discover something else needs to be re-worked.
)
Good luck, Paul.