Is your LO an independent sleeper?
Usually 30 min naps indicate overtiredness. I wouldn't really want to suggest doing his first nap any earlier in the day as that will almost certainly encourage the early wake up time, but I might consider actually reducing his second A time (rather than increasing) to more like 3h to see if you can get a longer nap.
What do you think?