This sounds a lot like a F1 pump relay going bad. If you search the prior threads, you will have found others who flatbedded their vehicles only to have the car shift fine after reaching the dealer.....However, inevitably, the relay will fail again, so it sounds like you should just repair it.