I wonder if you're in that whole OT/UT loop, a few days of 2 naps is too much but a few days of bad one naps = OT and then the process starts again.
How much sleep is he getting on the 2 naps, average? If you think OT then definitely do an early bed.