Yes, I am a Year 11 student, but I studied genetics for the School Certificate. What I did was draw the pedigree like yourself and then I allocated a genotype to the relevant people, ie Anne, John, Maria and Maria's husband.
Your reasoning seems logic and you may very well be correct, but I...