Yes, Affidavit should be notarized. In my opinion, this should be good enough.
Reason: Most probably, your PR card, Driving license have your full name in the last name and now your Passport reflects the same. Technically, you never changed your name since you are in Canada. It will be hard to...