I think you need to read this Post in the Tech Section.

http://suzukisavage.com/cgi-bin/YaBB.pl?num=1280002938

yep, you either need to swap the cdi or the rotor

the 87 and the 96 have different advances
once you speed up the 96 will back fire with the 87 cdi.

To the best of my knowledge there is no way to get the rotor off without the special tool.
I used mini female disconnects for the new CDI. I know I should eventually get the proper part, but "it ain't broke so I ain't fixin it." As for the right connections, there is a drawing on here somewhere that has where each wire should go. I'll give a look for it at lunchtime.

I just bought the special puller, and I have used it once.....it worked great.  I could "rent" you the tool to use, then you could send it back to me.  I intend to make this puller available to the members on this website through the Marketplace.  They would send me a deposit to cover the cost of the tool and the shipping, and I would refund them most of the money when they return the tool in good condition.  I have not yet figured out the rental cost.....something like $ 10 a month plus whatever the shipping cost is.

Let me know if you need this puller....send me a PM and we can work ou the details.  I am making the 46mm socket and flywheel holder tonight that is needed if you want to remove the left side crank nut.....which you need to do if you are splitting the case.