This is what my son has been doing for the last 4 months or so
6am wake
10 - 10:30ish - nap1 (no longer than 40min. ever)
2-3pm - nap2 (try to extend past the 1 hour mark but somedays impossible)
7/7:30pm - bed (no wakings)
Lately we've been all over the place because he's not tired in the pm until 3:30/4 and that would interfer with bedtime so we have had to skip nap2 altogether somedays. But for a long time he would get a good hour/hour 20 min. in the pm., espically if his am nap was at 9:30am-10am.
Like I said, I would keep the short am nap and extend the pm one. At least that worked for us for a long time, now it's a new can of bean because he's getting ready to drop one and then we will work on extending just the one - I must say this is not easy.
Good luck!