Glad you got a meds increase. Here, it usually takes about a week to see full results.
I usually try to resettle any NWs before 6am. If you can't resettle, I might try to push the As just enough to get us thru the day but not so much you're dealing with OT. If it's a regular thing, you'll have to look at the bigger picture - is he chronically OT, is there a routine issue, is it a self-settling issue, or is his clock just prone to early rising.