NOC for Mechanical Engineer !

[Hasni]

After getting my qualifications checked from the official NOC site, they told me that my qualifications do fall under the following NOC codes.
2232 Mechanical Engineering Technologists and Technicians
2132 Mechanical Engineers
My 80% job responsibilities match with NOC code 2132, but from the 38 mandatory professions, 7213 and 7217 suit me as i have got a chance to work as Piping Supervisor and Heavy Equipment Supervisor for 4 years in the last 10 years.
Please suggest that the above said combination is perfect to get me 21 experience points.
Thanks