If what you've got going is working, stick with it - I had 2 x 1hr naps for a while. This 2-1 transition takes a LONG time, you most likely won't be on one nap every day consistently for 6-8 months yet at least.
If you want one longer nap, you can extend the A time a bit and see if that nap lengthens back out again.