Yes, upgrade path is probably better and makes sure you are on the same plane from time of booking. So 2C + 2PE awards and immediately waitlist the upgrades.
Do note that there are rules for how and award can be upgraded, check in
The Big UPGRADE Thread – all you need to know about AY upgrades
IIRC, an award can be upgraded with vouchers but not with points.