I personally would stretch wake windows as under tiredness more common than overtirednesd. Why not try it and see!
Had the same issue and extended the wake window to just under 4 hours and nap went from 30 mins to between 60-90
It's hard when they probably need a longer wake window and less naps when they are only sleeping for 30 mins. My little boy just shifted to longer naps one day but in the run up I was helping him get back to sleep by basically cuddling him in his cot- holding his arms by his side.
My wee boy wakes at about 30mins almost every single nap time, it used to be killer but then I cam across advice on reddit saying to leave them 20mins (if not crying or upset) and see if they go back to sleep. Was such a game changer, he 9 times out of 10 goes back to sleep and has 1.5-2hr naps now, his 3rd nap is still short but that works for us - would definitely recommend giving it a go if you haven’t already!
Google crib 60 or crib hour