That jump-stop was going to be my first try. For $10, can't go too wrong. It seems that it and other products like it advertise helping to prevent the chain from dropping while shifting to the small ring. I wasn't sure if they would work for what I am experiencing as well.

Chain is the right length, I've adjusted the front der. as well as per the SRAM manual.