This is the match to my '97. Althought you have the upgraded motor, nice! Not sure what switches your looking for but I found a site that sells the original ones cheep.
I think I purchased 5 delivered for under $30. I added a few in the glass infront of the throttle.
Good luck with your rebuild, I will be watching for your interior photos. Dont need interior work yet but would like to see your ideas on upgrading.