Hello
I have problems with NW as well, so I hear you mama! Last night I slept in my baby's room on the floor (with several comfy blankets of course) Here are some thoughts if you're interested...
When you go into his room, how do you sooth him back to sleep? You might be getting into a new pattern, he is getting older and wiser, and perhaps likes being rocked, held etc., or is realizing you are not there and is afraid/anxious. Maybe you need to start the PU/PD method?
Also, have you introduced anything new to his diet? Maybe he really isn't feeling well. Or if you breastfeed, maybe it's something in your diet?
As for the 2-1 nap change..maybe this transition it is too early for him, every baby is different...many of my friends started this nap transition after 12 months. Just a thought.
Good luck and hang in there....I feel your pain...literally, every night for the last 9 months, lol