just to give you guys an update
I went back with my citizenship card, and they took a photocopy and that was it! Didnt need to change all my documents. They said it should be ok and I got an email later saying I was approved and to wait for my card!
I seriously dunno why the cbsa was being such a pain in my ass for?