Hi hun, big hugs as this is a terrible stage! My DD went through it and we barely survived it! Luckily she is now sleeping to around 6.15/ 6.30 on a good day and 7.00 on a really good day! I think they just grow out of it. Keep the sleeps up, if your DS needs 2 sleeps its better to let him have them than fight a grumpy & tired toddler. Can you go back to sleep when he does for his morning nap?