In light of all that, I would print off all your FF charts, explain to your GP what you have just detailed here about AF, and get him to get the ball rolling.

It sounds like you have a "feeling" something is not 100%, and simply by getting your GP on your side, get his support, get a plan together........this alone, along with the knowledge of your cycle, will probably help.

That way, at least you have a positive "plan" in place, which is always better than simply wondering.

Good luck!