Help! Points for education... (16 years & Master's degre

Hi

I am planning to apply for skilled independent immigration myself, and had the following problem in calculating my points:

I have 16 years of full time eduction (5 years primary, 6 years secondary, 4 years Bachelors, and 1 year Masters).

However, on the points calculator, we get the following factors:

** One Bachelor's Degree & 14 Years Education - 20 Points
** 2+ Bachelors' Degrees & 15 years Education - 22 Points
** Master's/PhD & 17 Years Education - 25 points

I do have a Master's degree, but only 16 years full time education, so I won't get 25 points.
But to get 22 points, I need two BACHELOR's degree, whereas one of my degrees is a Master's, so I won't
So it looks as if I will only get 20 points.

Have I got the right conclusion here? I need 22 points to reach the required 67 pionts, but I am not sure if I will get 22 points for education, because I have a higher degree than what's required!

Please can anyone who is in similar situation help! How many points can I get?

Many thanks!