Just read through this whole thread, gutted for you mate, know how much this one ment to you.
Thought I would mention, IIRC the dealer network has access to any car up for sale at any dealership so if you find something better from another dealer I'm sure yours will bend over backwards to get you to see it and get it for you.
Good luck whatever choice you make, you got me worried though, might do another HPI check on mine in a few weeks make sure it hasn't changed.