well we had the same cycle at our end and we were done with playing musical beds.
So for a week, I bit the bullet and would walk the child back to their bed, it was rough for a few nights but we are back to normal now. Its not perfect, but its only 1-2 nights a week, and mainly because of something or the other, tummy ache, wee, bad dream whatever.