So.....10 weeks later and after (temporarily) fitting a series of OEM parts, my bike passed the MSVA. Now to apply for the V5 and put all the good stuff back on!