1997 Jeep Cherokee Tranny problem

I have a 97 grand cherokee that has the 42re trans.
It simply stopped moving the other day after running fine before.I changed the filter and fluid and now it drives. It still don't shift quite right and when you stop in gear it whines fromthe pan(if you're moving it sounds normal).I used atf+4 fluid and have checked the level several times both cold and hot. Also today when the tranny got hot it would just die when you put it in gear. Any ideas short of having to rebuild or replace the tranny would be very helpful. Thanks