Problems with diluted urine and OPK

Hey guys! So I’m trying to stay well hydrated (all the time, but especially during fertile week). I know this plumps the eggs and produces better CM. HOWEVER, when I go to do an opk, my urine is always diluted. I’ve tried backing off on how much I’m drinking a couple hours before testing, but I still usually have to pee during that time. And then by the time it’s time to take a test, my urine is diluted from not having a long enough hold. Any tips or tricks?! Thanks!!