Yeah, if you were to count those, it would be 5th. But then again, why would you?
I think he will just force Goku to revive him with the Earth Dragon Balls and will be mighty pissed off when he finds out they can't do that, not anymore.
I wonder about Cell. He was never even mentioned. Is it possible his soul has already been cleansed and he's been reborn as a normal person? Because, that's what happens on Hell if I understood correctly, right? Freezer/Freeza/Frieza is just a special case that refuses to change and thus, remains in his own private corner of Hell. Who's to say that Cell is the same?