You are doing what you are comfortable with, which is always important.
That said... I would personally do the opposite. I don't put a dime into my mortgage until RRSP, TFSA, and RESP for the kids are all maxed. I'm in variable mortgages (2 properties) paying 2.1% interest. My payments are set as if I was in a 4.5% fixed mortgage, so I am already accelerating the payments to substantially, but anything extra goes to tax sheltered investments before they go to paying down debt that's running at 2.1%
In terms of credit vs. emergency savings, I do have a HELOC available for that purpose, as well as a higher interest unsecured LOC. Assuming you have the discipline not to dip into the LOC so that it is available for a real emergency, I think that makes sense.
I am unlikely to pay down debt at 2.1% - I am comfortable that I can beat that return handily investing, so it wouldn't make sense. If interest rates get much higher, that would change - and I can always take any unregistered investments and pay off the debt in the future if it makes sense to do so.