Nic, I have no advice but just wanted to offer hugs.
Jake will be going into a bed in the next few weeks and I'm sure we're going to have this problem too so hopefully someone has some suggestions!