Hey Anna - I would definitely try your suggestion with the naps - even just getting it down to 2.5 total you may notice a difference.
I have a post going under toddler sleep but we are having kind of similar issues although NWIng probably doesn't last as long as you. My DD prob STTN about 30% of the time and sometimes I wonder if its teething or...or....or who knows?! So we've decided no picking up - we are doing WI/WO. My DH did it last night and I did have to force him to go in a few times, in 40 mins he prob only went in about 4 times. Its my turn tonight and I'm scared!
Anyway just wanted to offer support. Have you thought of doing GW with your presence in the room? could be another option to consider.
Like you I'm going back to work in a few weeks and I'm determined now we have started this to see it through - shes nearly one and I just feel like I need to rule out any potential props to try and get more consistent STTN. Although I was balling my eyes out at the same time as her the other night - its definitely not easy but hopefully worth it.
Sounds to me like hes started to rely on you being in there a bit
![Undecided :-\](https://smiley.babywhispererforums.com/Smileys/classic/undecided.gif)