Glen, you are correct, except I think you may have the two pieces backward. I believe it's the tops that are the same, and not the bottom. In the first picture, the one on the box is a '36, and the other is a '37-'38. In the second picture you can see them sitting on top of each other. The curves on the bottom pieces don't match.
One of these days I'll get around to putting an ad on here to sell the '37-'38