Ok, so I did the above which are commented, the rest will be done tomorrow.
I found one thing out of the ordinary with the relay boxes: one relay had clearly been hot on the contact, which leads to a thick black/red wire. It was the second from the tail of the bike for me, but you can easily swap the last two boxes around.
Does anyone know (based on the wire color) what relay that is?
Pic:
According to the drawing I have.. fuel pump.