Maybe I'm completely off but I'm not sure about the 35ms shift in D3. What says you that the shift is completed at the point you were drawing the "end of shift" line, swamp? My understanding is that the shift can't be completed as long as the acceleration is higher than it was before the shift and that's some time longer. In case I'm plain wrong here say it in a nice way please.
Best regards, south