Fenix 5x purchase advice? New model right around the corner? cracked sensor lens?

I am looking to replace my Fenix 3 with 5x for the map capability. But I wonder if I should wait for the next model if its just right around the corner.

Also, I read about cracked oHR lens, is that an issue i should worry about?