Does he sleep through the night? You could try altering his nap time, but to be honest, if he sleeps through the night, then I wouldn't mess him about for the sake of half an hour, 6am is not too early a wake up time (IMHO), I would just go to bed a bit earlier!!