Your versions are correct, though I'd put a comma before 'whose' as it is non-restrivtive (non-defining) as there is only one Tony Blair. You're right about the gerund, because it needs to be that to be the subject. 'That' doesn't make sense unless you rewrite the sentence.
