I wanted to share a similar situation, bought what the vin number on the frame says its a 98 Warrior but when I ordered an oil pump and ignition switch online what showed up made me wonder if the motor was not the original, so Im in the same boat, how to determine if motor and chassis are a match