Call Nokia's customer service line (their Canadian website should have a 1-800 number) and ask for a specific store in your area that would exchange the battery.
At the very least, do the exchange after your upgrade so you can sell your phone with a new battery.