I'd like a Classic with things reworked from the grip to the butt, allowing for a higher/thicker comb and better head placement. A small notch for bolt travel like on the A1-3 would be fine by me.
Regarding smaller patterns, the Compact would be dandy with a bit higher comb.