I don't believe the Avogadro constant needs to be an SI unit. It's like having 12 as an SI unit, or a million, or 1. Sure, it's a useful constant scaling factor, but it doesn't need to be canonized at the heart of the SI system. It doesn't actually express anything fundamental about how we measure our universe.

And if nothing else, it can be derived: a mole is the number of atoms in a kilogram of carbon-12. Done.