I've read several guides that say the same thing. But as you said, they never said when crit becomes higher than mastery. As for having to much mastery now, I think you are fine.
Lets hope One of the theorycrafters will pop in here and tell us the number to watch out for with mastery.