The age 21 RATP allowance is specified for 61.160, not 61.159.
So that should mean you have to meet one of the three 61.160 categories to get an RATP at age 21.
I wouldn't sweat the extra 500 hours, if you want an aero engineering degree, get one. You'll learn more and have a solid backup degree if you ever need one.