Selecting a race type for short punchy road races

My A race(s) this coming season will be the National Senior Games in Pittsburgh. These are short road races (12 and 25 miles) on what I expect will include lots of short, punchy climbs. These seem too short to be a good fit for “Climbing Road Race”, but can be punchier than a normal rolling road race. Should I set the events as Criteriums to insure I get the Threshhold/Vo2Max emphasis I think I’ll need? I’m using plan builder.