You're right. You don't get a "fresh" two year warranty. When I spoke to BMW Canada, they must have taken mercy on me. They're going to send it to a case manager to review.
Just a heads up, apparently the active tanks design has been changed in the last couple of years from the original design. I believe the components are redesigned with something similar to what Xemodex rebuilds them like. A little more longevity, a little less pain in the ass.
I'll let you guys know what happens where I hear from BMWCA.