Mostly if you trust your class 1 and they are as renowned as you say (not as they say) and you've done the extra training, it doesn't matter if you have the same examiner. In fact it may be to your benefit.
But I agree about the issue regarding the FIG. It is gospel and has to be adhered to as per TC requirements. So, without more info, not sure where the disconnect happened between the examiner and your Class 1?
But if it's resolved, trust yourself. I've failed a few times exams and although felt super sorry for myself and nervous re-doing - I also completely understood my lack of knowledge was dangerous and especially if you're into teaching. Last thing people need is a terrible instructor.
Also ask your examiner questions. When I did mine, I had my in-flght lesson book I laborouously prepared and was afraid (but did!) Ask if I could refer to it during the lesson to regroup. Funny now I think how afraid I was but it's natural.
Good Luck! Lots of spaces for FIs!
