I agree. There's a clear shift in his motivations between the two arcs. During the Freeza Saga, he still wanted the dragon balls and immortality, but only put it aside due to the bigger threat in Freeza. He'd stab any of the Z Fighters in the back given the chance to get what he wants.
Once...