So I fixed the kickstand issue, it was in fact the relay and the new (used) one I got from ebay didn't work either so I just unplugged it and it worked.
The new issue is that when I get to the end of a straight line drive and let it drop to idle, it dies. Immediately I thought it had to be...