Hmmm, not sure - I am absolutely not an expert (you should see the number of threads I had open for lily at this age! Lots of NWs and EWs!) but looking back through them she was OT at first, waking up from her second nap grumpy and doing 10-10.5 hour nights. I started doing an EBT to stop her day getting too long (no longer than 12-12.5 hours) and cut her A times from 3 hrs 15-30 for both naps to 3 hrs before her first nap and 3 hrs 15 for her second. She did mega naps though, so we could easily do that on 2 naps a day.
Then when she got over the EWs and OT, she was ok for a bit and then the EWs came back cos she was getting too much daytime sleep (like, 3.5 - 4.25 hours)! I had to extend A times again to where they'd been before pretty much, and cutting her day sleep to around 3 hours.
Not sure if that really helps you except that the difference I found with the OT /UT EWs was that she would tack on for OT early wakes but not so much for UT early wakes. So I'd try and stick with the EBT of 6 at the latest (you might even need to go slightly earlier, to 5.30), and see if that gets a longer night so he's more rested the next day. You could try that with your current A's first and if that doesn't help then maybe take 10-15 minutes off his A times, just for a bit to see if it helps. If it doesn't then at least you've tried it???
Having said all that, I don't want to offer conflicting advice so I offer it only as something else to try! If you want to do set naps though you're probably better off picking 2 nap times and sticking to them to set his body clock. So it depends which way you want to go really.... (((hugs))) it's really tough trying to figure all this out. We're in a mess again due to a cold throwing things off just as we were getting somewhere so I'm with you again in trying to figure out A times!