I'm also looking at this swap and the speedo mod, except for a '97 16valve kick motor. ÂÂ
That speedo mod sounds tooooo easy to do myself to pay $50 to Trailtough to do it.  Does anyone have pics on how to do the speedo mod?  If nothing else, I'd like to keep my speedo here and on my Zuke to avoid downtime while waiting for the harness to get back.  Also, does Trail tough need the wiring harness out of the samurai to modify the Kick harness? ÂÂ
Finally, how long is the turnaround on a modified harness?  With a little luck I'll be going 16v 1.6 in between Gonzukin and Zukimelt.  I just need to be certain I can finish before the melt or that I can have my 1.3L available in case the harness takes too long.