Probably the latter, but if the reborn minions this expansion are good and any that they throw in later are as well, that can be fine. So far both reborn minions that we've seen are quite good.
And probably 2 mana for that last. It's Righteous Protector plus Reborn, or Annoy-o-Tron minus one health to gain Reborn, so that seems about right.