Tranny Trouble

2002 Sienna - fought dealer to replace faulty transmission in 2005 @ 20,000 miles - now, 3.5 years and 28K miles later, the rebuilt tranny the dealer installed is crapping out again - bucks and hesitates when shifting from first to second - any “best recommendation” for dealing with Toyota? I do not think I’ll get anywhere with the dealer - when they finally agreed to fix the tranny the first time after corporate stepped in, they (a) forgot to set the neutral safety switch and then (b) returned the car with the driver’s door power window panel hanging by its wires -