This does sound like OT. What time is WU and BT on NNDs?
In case it helps you, we had a plan for the 1-0 (went though it at a similar age - first NND at 22 months, done with naps by 28 months) which actually worked pretty well for us, though we did have NWs. We did WU whenever (never woke her, usually 6.30-7), offered nap at 1/1.30pm until max 2.45/3pm. BT 6.30pm on NND and 7pm on nap days. When the NNDs started to become more frequent and she was clearly getting tired, we would go for a drive around 3pm and let her have a catnap of 15-20 mins, then BT 6.30.