A little up thrust might help but I think your best bet for getting rid of the rocking is to move the cg back just a little until you like it. This may also help with the nosing over since the weight will be further back and will make the plane want to hang on the prop. Wing rocking is cause by one wing stalling and when the plane rolls the stalled wing downward it creates lifts and the opposite wing stalls. This tendancy becomes greater with weight as the wings will have a higher stall speed. By moving the cg back you, in a sense, make the wing more effective at higher angles of attack. The change of prop should help this as it will generate more prop wash to keep the wings stable during high aoa maneuvers. It will also help lessen the torque rolling which I beleive may also cause the plane to want to nose over. Since you have to fight the torque with such a large amount of aileron you are changing the lift that each wing generates. This will make the wing rocking more pronounce and, I believe can cause the plane to want to nose over. When hovering with a large amount of aileron deflection, one wing is, in a sense, generating lift in the opposite direction as the other. I think that when you take this into consideration with things like p-effect, that this can cause the negitive lift generated on one wing to push the nose over. I tried to keep my explanation short and simple so I hope that helps. Also, remember when flying outside that you are a lot more likely to see wing rocking as wind is never at a exact constant rate. The slight variations in wind speed will cause the wings to be balanced one second then stall the next. With the right prop and cg you should be able to almost, if not totally, eliminate these problems, once you finish making the adjustments. Just remember to make one change at a time cause one change will have numerous effects.