Which Super villains swapped in for their Z counterparts would be an improvement?

[Warmmedown]

Eg U6 saiyans instead of Nappa, Frost instead of Freeza, maybe Zeno instead of King Kai. Obviously for the fighting characters they'd probably have to be powered down for it to be workable.