It is not a shift solenoid issue.
Bring it in and have a professional diagnose it.
My feeling is the fluid is part of the problem as well as buildup/dirt in the trans.
Don't "think outside the box".
There is no box.
Do it correct, or do it twice.