Sleep issues...

Anyone else having sleep issues with their August 2017 babies? Maybe around a month ago, my son switched from sleeping from 7:30 pm until nearly 8 am, to now sleeping from 7:30 pm to 6:30 am at the latest. He is down to one nap a day and his naps have generally been 1.5 hours, I would be lucky to get any longer than that. Well, in the past couple weeks, he won’t even nap an hour. I’m 38 weeks pregnant and wanting to rip my hair out because on top of that, he is in the worst possible mood. He is always throwing tantrums at literally everything. He whines and cries all day long. I knew I was soon going to have 1 unpredictable baby, but I wasn’t planning on 2 of them.