For Surrender, go with same name as written in the Indian PP as I did the same for Surrender application & the Surrender cert, which you will receive will have full name.
And when applying for OCI you can then use new name as per Canadian PP and name change certificate from the province.