MY DD#1 Did a similar thing just before she was two. I cut out the nap and she was back to sleeping through the night.
I was sad to see the nap go as I was about as preg. as you at the time. And it was painful to be not sleeping at night and no naps during the day.

Good luck