Not your average speedometer fix question.

My 95 ls400 has had the dreaded sticky speedometer for about 1.5 years and just recently the tach started to stick and would take a very hard hit on the dash to awaken it.
So I decided it was time to pull the cluster and do something about it.

I spent about 2 hours getting the speedo and tach out completely to try and clean out the lubricant, only to find both needle stops completely clean.
Having not wanted to do all that work in vain, I decided to try Och's pin fix that I saw in the large cluster fix thread.

Basically I inserted a pin into the cluster face to hold the speedo and tach needle just above zero to keep them from sticking.
Tach rests around 50 and the speedo rests around 5mph.

After getting everything reattached and back in the car, I started the car and the needles instantly sprung to life. Success!

...Sort of
Tach works perfectly. (possibly 50 high)
Speedo, which rests at 5 when the car is off jumps to 15 when the car is started and then is 15 mph high at any speed.

The original creator of this fix (had a 94, I have a 95), said his speedo rested at 5 but would stay there until he got above 5 mph and would then work flawlessly.

So my question is, what can I do to have result like him.
Is there a way to rezero the needle?
I remember reading in some thread awhile back, of a speedo that was high like mine being fixed by pulling up on the needle to release it from the mechanism, letting the internals reset to zero then pushing the needle back in place.

My thoughts are to pull the cluster, remove the plastic face, reattach the cluster, start the car, pull the needle and set it back at 5 on the pin, then push it back in place. Turn the car off and restart it to check the results.

Just wanted to see what you guys thought before I took the time to pull the cluster that many times. Because that thing is a major pain to take in and out.

If all else fails I guess Ill just remove the speedo pin and be back where I started, just with a working tach.