When to test

Steph
Being I have pcos and I've been takin Metformin for almost a year now. I have a question. My current pharmacy unknowingly refilled my metformin xr with standard metformin and as a result my cycle which had finally regulated went haywire (shortened my cycle by 4-5 days). My doctor reordered my meds and I have been on the correct meds this cycle. 
Normally I ovulate on day 15, howver when I was using my cb advanced ovulation kit, it indicated I was peak 5 days earlier than normal. 
​ 
​So now I have the dilemma of when to test as in my previous pregnancies (both miscarriaged) I tested 14-15 days after the peak read from the cb test. But here is the issue, do I based off of a normal cycle or my last cycle? Or do I test like normal at 14-15 days after my peak read?
​Note* All of my period/fertlity tracking apps have different test dates as well as possible AF start dates.