Sorting Issues after upgrading to Unity 6

Prior to Unity 6, my Shapes menus sorted correctly. These are all created as components, and I do not use immediate mode.

I have done a clean reinstall to upgrade from 4.1 to 4.5, but the issue persists.

Manually changing the sorting order does not seem to help either. The incorrect sorting is not static either, sometimes it sorts (somewhat...its always slightly wrong) correctly, other times, its wildly wrong....so, normal for sorting order issues (or z fighting)