Verbal Approval of TN by CBP but no TN Visa

I recently flew back from Calgary to SFO and wanted to get my second TN for the upcoming year as my current TN expires in Sept. I approached the officer in Calgary, advising him that I had been working in Cali. and would like to apply for a second TN as my current one expires in Sept. He asked me if it was the same job/ employer as last year (yes) and said no problem. He took my passport, was stamping, stapling etc. and asked me to fill out a form with my name/ birth date etc. then told me that everything was done, good, go ahead on to the flight and he'd "finish the paperwork." I was relieved that it all went so smoothly as I noted that there have been more problems reported by people on the forum. When I got on the plane, though, I noticed that although my passport was stamped with that day's date, the expiry of the TN was the same as last year's, and the TN visa itself stapled into my passport was the same. I presumed that there had been a mistake, and asked my husband, who was with me, if I had been clear about my request etc. and the approval of the officer (yes, and yes). We were shocked and spoke with 3 different immigration officers at SFO, none of whom were able to be of any help (they said that one couldn't apply for a TN at Calgary, but had to fly into the SFO International terminal from an 'international' origin (Cdn. flights go into SFO domestic). We went to the Deferred Inspections office (immigration) in SF the next day but they couldn't help - and said that my reiteration of the exchange with the CBP could be a lie and that we were supposed to have walked up to CBP officer in Calgary with our check books open and saying 'I will pay you whatever the fee is.' So, now we're concerned as to what to do and I'm wondering if anyone else has had any similarly odd experiences. Additionally, in all this mess, I noticed that last year our TN stamps on our passport were written such that they expired 2 days BEFORE they were issued (the officer wrote the wrong year).