Ducati Monster Forum

Swapped my OEM 96 m900 forks for 95 916 forks.
I originally put the forks on the wrong side and the front wheel fit on perfectly, I have a machined spacer to make the axle fit.  However, the calipers would not fit, which is how I realized my forks were on the wrong sides.
So now I've put the forks on correctly, and now my wheel will not fit correctly.  When inserting axle from the right side, which is 'correct' my OEM spacer will not push far enough into the left fork because of the flange, so the wheel is offset to the right side.  When I thread the axle from the left side, the thick part of the axle ends up running into my speedo drive and not allowing me to get it all the way in.
If my stock spacer was threaded at the end with the flange, I could insert it from the outside of the left fork and this would work perfectly.  OR if my speedo drive had a bigger opening and could accomodate the thicker portion of the axle, I could thread it from the 'wrong' side and insert it from the left fork, with my oem threaded spacer on the right fork.

What is the easiest way to solve this, a 916 speedo drive?  I know the calibration may be off, but I understand that I can swap the guts.  If this is the case, would that drive be a direct swap into my wheel and all my problems are solved?

Please ask if any clarification is needed, this is one of the last details I need to button up before I finally get this thing up and running again for the season.  Thanks!