you are correct, neither thin or thick plates exhibit critical flow characteristics because of the entrance losses.
Thick plates do offer a discharge coefficient that is nearly independent of reynolds number and tend to approach critical flow behavior better than a thin plate. You only approach critical flow in really thick plates i.e. T/d>>>D, because you achieve pipe flow prior to the final expansion, but you still have to deal with the entrance losses.
There are corrections for the "critical flow" behavior of thin/thick plates (T/d~1) in Millers Flow Handbook, but they only increase the complexity of the calcualtion rather than improve performance.
A flow nozzle does achieve true critical flow. Some of the meter manf. can supply them.