we're also fans of the sleeping bag (since about 10 weeks) when he started "houdini-ing" out of wraps(or we're bad wrappers )... Maybe bubs could roll back if in a sleeping bag? Don't know how the motorcycle arms would go though... my little man just likes to starfish... both arms straight out either side.

Also, are you doing the angel wrap (i.e. hands up) or the regular wrap? Maybe play with that too?