1. Only someone laying hands can determine if you have a short, but more than likely this is a lighting ground issue, not a short.
2. This vehicle does not have a neutral safety switch.
3. If the battery is good, the issue could be the main ground cable or the starter itself.
If it's the starter, we have both 2.2KW and 3.1 KW models available.
The 3.1 KW is a little more costly, bit will spin the engine much faster than the original 2.2 KW unit.
Uncle "Richard" Douglas has a Land Rover with big wheels that never gets stuck... until he breaks something so it won't go. Uncle Douglas always breaks something. - Anna Crowther at the Conclave 2012 (AKA Carburetor Neck)