Keep sorting - every improvement adds up! And, as you say,"Still no regrets. This is a fun bike."
Your charging numbers are way too low - so, regulator, regulator case ground, primary gearbox ground, stator wires, 30 amp regulator fuse . . .
It will be absolutely worth the effort! Lovely bikes!