I've said this to you before... I think FF had it right. I know you aren't liking those three days of temps... but your CM does not indicate you being fertile on CD 16, since you marked it as Sticky.
I know it's tough sometimes, but not every chart can be picture perfect. I really would advise you to leave it as FF had it and just be patient and see what the rest of the cycle brings you.
Ultimately, it's your decision on what you do... but as you asked for opinions, I'm just giving you my