On days he has a nap (although we start bedtime at the same time 6.30 to 7 ish) is it time to drop the nap 
We never let him nap beyond 2.30 - and he just doesn't drop off and most of the time it takes an hour to get him to sleep.
Without a nap we move bedtime earlier and he's mostly asleep by 8 pm.
Also he won't fall asleep without someone in the room with him - so the 9.30 pm thing is very irritating. Basically get in from work dinner afew chores - start bedtime routine - bath etc - sit in darkened room for a few hours. Basically DP and I get from 9.30 to 10 together!
What're time he drops off he wakes sometime between 7-8am.
What would you do?