you only need name change certificate and nothing else.
I used my drivers license for address proof and it have my new name (first and last)
affidavit only required if you are adding or deleting a word or letter from your name
I had the same situation.
You only need name change certificate.
And use your new name (first and last name) in surrender certificate and oci application.