Congrats on your pregnancy. I wish you a happy & healthy one!
I have been in that situation with naps vs. bedtime/wake up issues. I myself would prefer the bed at 6:30 wake at 6:30 no nap route. I crumble at 7:00 pm ad I am NOT a morning person.
So, what I have done is let my kids give up the nap but they MUST absolutely MUST (no waivering on my part, no negotiating on their part), have 1- 2 hour quiet time alone in their rooms.
I still have that rule. When my 20 month old naps, everyone has quiet time, including me! Oh how I dread the day when my son gives up his naps.
My best to you.
A.