I think you have two separate problems, the creeping forward in Neutral and lockup in Reverse is caused by a rear clutch that's too tight or sticking.

The other problem is in the kickdown band or servo, try a simple adjustment.