There's a thread about a similar timing issue,
http://www.suzuki-forums.com/suzuki-...ng-timing.html
try placing the timing the way it was when you found it and see if that fixes it. If it does take a look at the thread above.
Also for your CAT, on 89~94s it's on the manifold and on 95~98s you have one on the manifold (only not smack in the center like the old er models, it's further back almost under the firewall) and one after the CAT. So the CAT you received would probably work.
Good luck.