I agree on the CG. Its way too conservative at the specified location.

The wing rocking can be stopped for a little bit if you anticipate it and correct it before you see the plane do it.
Once you see the plane do it the correction you make is already too late. As RSands said, "it'll correct itself" is basically true. It will correct itself when it rocks the other way. If you can get the input in right before it starts you'll see that for a few seconds the wings wont rock at all. Eventually, it will start again but if you can feel it before it does it, you can extend that time when they are not rocking at all.