Google's John Mueller repeated advice from a while ago that you should not switch your m-dot URLs to be the canonical URL, even though Google is fully switched over to mobile-first indexing. He said this is just because it is how it is done, how it was done, and switching it on Google's end would cause many large sites issues....
-
Google: Don't Make Your M-Dot URLs The Canonical
seroundtable.com