That makes sense.
I will probably do the same but I am still hoping CIC will notice this big flaw and will update the calculator accordingly. Have they evenynoticed this issue? They should have just taken the old calculator before the 2015 citizenship requirement changes! At least that one was...