You might see a better night after the nap has gone. We only had 10.5 - 11hr nights from birth until the nap was gone, now my DS does 12hr nights which is bliss!
It might also be an idea to start thinking about either a gro clock or lights on a timer to slowly teach him to stay quiet after he wakes in the morning and entertain himself with a toy or book. Mine has had lights on a timer which has worked great, when the lights turn on he is allowed to get his book, and he reads in bed for 20 mins before getting up. Whilst you might never get him to stay asleep until 7am you might be able to settle on something like a 6.30am WU with a 30 min quiet play before both kids get up properly at 7am. Might be something to work towards.