Hi all :-) I have started and frogged a pair of socks from the Socks Soar book 2X

The sock pattern is Columbine Peaks, and is a very basic lace pattern using YO's. the problem I am having is that a YO falls at the end of each circ needle (i.e. I end with a yarn over and then need to switch over to the other circ needle). Is there a trick to ending a "row" with a YO? Both attempts, I end up short a stitch or two, and I'm sure it is the YO at the end of one needle that is somehow not staying in place
Any advice? Has anyone made these socks?