Wheelo and Gero, Toriyama's recycling?

[some_weirdGuy]

Not sure if this belongs here or in the In-universe section, but I've had this thought a while ago, and recently was reminded of it:

There are some definite similarities between the plot/story surrounding Dr Gero, and that of the earlier movie villain Dr Wheelo.

Both are androids, who had their brains removed and placed into robotic bodies(amusingly enough, both visible through glass domes) by their faithful android creation/assistant, both making a return after a long period of withdrawal from society and who know of the Z fighters past (Wheelo going after Roshi, Gero after Goku).
Both are also brilliant scientists who create artificial minions and have an interest in bio-mechanical research, ((i guess there's also a certain similarity between their names (Uiro, Gero)... wonder if that might indicate Gero's name pun).

What do you think, any merit to the idea? Toriyama taking Wheelo's story and tweaking/evolving it into what became his next saga's originally intended antagonist(or the reverse, the anime staff using an 'scrapped' plot line from toriyama's notes or something as a basis for wheelo, only to have him end up using it later after all).