I think you can also choose to use the longer lower shock-ends (BallCup) option instead of the longer shaft. (this is what I'm going to try first, as this is what I used on my M05)

unfortunately I don't have partnumbers handy, just familiar with the parts I've used. all the shock parts-trees come with both the short and long lower shock-ends so you may have those laying around and/or in your current kit...