So I think that your lo needs more A time during the day and that may be causing the EW too.
When your lo wakes up early, try to ignore him unless he starts crying. If he chats and babbles, then leave him alone in his crib. Don't go to him. If he does cry, then go to him, calm him down, and put him in his crib. Leave him there until wake up time. At what time do you want your lo to wake up? I think 6:30 am is what you have been doing, right?
Ok, so if he wakes up before 6:30 am, just ignore him and let him stay in his crib. (Unless he cries) But we need him to let him know that the day starts at 6:30 am. We are going to consider his wake up time to be 6:30 am, so after this, we should extend his next A time. Try to have him down for his nap at 9:30 a.m. If he takes a short nap, try to extend it by shpatting, but if it doesn't work, then leave him in the crib with a toy or some thing. Then, take him out and let him have some A time. If he takes a short nap, then try 3 - 3.5 hr A time and see how it works.
We need to increase his A times by adding 15 min. So I would start with the first A time. So for a couple of days put him down for his nap at 9:30 am, no matter EW. When having EW, los count on the first nap as an extension of their night sleep. So that's why we need to have that first nap at 9:30 am and not before. Does this make sense? If he still has an EW, then we will have to push that first nap even later.
Once we get that first nap sorted out, we can then move to the next nap. If your lo gets a long first nap, then his next A time will be 3.25 hr.
We will have to experiment until we find the right A times for your lo to get longer naps. We need him to get those 4 naps into 2 long naps. And for doing this we will need to modify his A times.
So try that first nap at 9;30 am for a couple of days and let me know how it goes.
Hope this helps
Alexa