Did Queen Serenity intend for Raye's grandfather to be a Shadow Warrior?

(For the purposes of this post, I'm gonna use dub names and terminology, since this board seems to use that most)

So, we know that Queen Serenity used her Cosmic Moon Power to wipe everyone in the Negaverse Invasion clean from their current existence and set them to be reincarnated in the future, right? THEN, we see that the Princesses of the Silver Millennium all eventually received their original powers and such. B

But, more interestingly, Negaverse beings also managed to receive their original power (or atleast a fraction). I'm speaking primarily about the Shadow Warriors. In their human forms while still housing the Rainbow Crystals, most exhibited psychic powers, tipping us off that they were not originally human. Amy's boyfriend Greg was clairvoyant, Lita's love interest was telekinetic, ect. But, MOST importantly, Raye's grandfather was a medium...

Because Raye's grandfather received psychic powers, his granddaughter would naturally inherent the same power, having his blood running through her veins. BUT, he got his powers from being a reincarnated Shadow Warrior. So...does that mean Raye got her natural born psychic powers from the Negaverse?

We can see a clear distinction between which of Raye's powers are from being a medium and which are from being Sailor Mars. Everything spirit-based deals with being a psychic while everything fire-based deals with being the reincarnated Princess of Mars.

So, did Queen Serenity intend for this to happen? Obviously, she knew both the Shadow Warrior who held the indigo Rainbow Crystal would be reincarnated AND that the Princess of Mars would as well but did she intend for them to be related? Does Raye's psychic power actually come from the Negaverse?

