I was postulating the theory yes, but as I have been saying to my mates for months, he probably was faking his death because he's too well known, especially after what River said in A Good Man Goes To War. Can provide logs if you don't believe me :P
I don't think he'd be replaced just to coincide with it, but they'd make his natural end coincide with it.