My 96 was a bit slow around 2K as well.  Talking with Wildgoody about it he ran his about 2 degrees forward of what the factory recommended, as do I.
On a 96-98 the diagnostic plug is up next to the passenger side headlight.  At 800 rpm stock the timing is around 8 degrees, I run mine at 10.  Or 7 with the diagnostic plug enabled.  Engine runs great now, lots more power on take off.  Mileage is still a bit lower then I like though, as I was getting 27 mpg with the old engine.
If your running 5 degrees of advance at idle your probably around 3 degrees behind the curve.  One way to find out where it is supposed to be at with 96+ models is to get an ODBC II scanner.  It can tell you what timing the computer thinks it is using, then just tune appropriately.  Not sure if an ODBC I scanner does that.