I'm thinking maybe O on CD#16.. But you would need a couple more days of high temps to confirm that. If you peek at your chart in Celsius.. IT looks even a little more obvious that CD#16 could be O day and the day of EWCM backs up the theory as of right now.
Good luck! I hope this is the beginning of your 2WW