Agree with all that, except that they just need to drop the "Air" moniker. Should be MacBook and MacBook Pro; iPad and iPad Pro; iPhone and iPhone Pro.
I mean, what's next, AirPods Air?
And the naming structure is different across product lines. in laptops, the Air is the low-end model. in iPads, it's the middle model. In phones and other bits, there is no Air model. Air used to be the word that delineated the "really thin, light, new thing" and commanded a higher price. Now, it's all over the place.
It needs to go away.