I have a 98 XJ, straight 6, auto. For the last 6 months, on start up, sometimes if it doesnt fire straight away, it just engages and then whirrs away. Its now got worse and won't turn over the motor. Popped the starter out today and checked it over, cleaned the solenoid and bench tested and all...