The form isn't very different from what I submitted. The only difference I see is the link I provided has two witnesses at the bottom of the form and the one I submitted did not have any, and I don't think that will be a problem.
Ok, I was in a similar situation regarding inclusion of Spouse in the passport. I say don't do it, it's a bigger hassle.. you need more documentation for it, something attested from New Delhi.
For the Name "change", you'd need these:
1. Name change Affidavit notarized locally (in Canada).
2. News Paper ad, one in Canada and other in India (national newspapers). It should be a month old when you're applying for the name change in the passport.
3. All the other documents that are required for the Passport renewal, Workpermit/ PR- original, address proof - local and photographs (Indian passport size). And two photocopies of everything.
4. And o'course the completed application.
Make sure you check the website for any additional documentation.
All the best!