Yes, those are two different circuits. I don't know how many versions there may be of them, but I've liked the one in my 98's the best, which have a sliding adjustment for the light timer.
My 93 Limited had a separate switch on the mirror to turn off the automatic light function, but not control of the time it'd stay on when the key is turned off. I forgot how that was adjusted, but I kept that mirror for my 99(the glass was all broken and the mirror already gone(in JY for a short time)). I prefer the older type that has a set screw to mount the mirror. That one has always stayed tight, the 98 mirrors vibrate a little.