i think the same as you, while ruling the infinity fortress, even if he was known as the raitei, he wasn't always in this stage, but i'm not sure because while at the infinity fortress he always had spiky hair, and that's only when he is in the raitei mode, right?
whatever, ginji's electric power are his own. so i think raitei and ginji were conected it's not just raitei is a complete different personality that possessed him. well, at least that's what i believe