That's true. He's effectively replaced laying low so his people can't easily find him (or rather attribute his good deeds to him, thus giving them justification to track him down for interfering), with laying low to avoid becoming a victim of his own success.
Even so, I somehow get the feeling that "The Fall" is something that he engineers, a la "Angels Take Manhattan", and just as he thinks he's won and successfully faked his death, he cuts his tongue whilst licking an envelope and regenerates. :P
Mark