FWIW I went ahead with a refurb and used greenbean. I had an excellent experience with them (despite it being my mechanics first gig!). They were the lowest price (<2500), they came to you to do the work (almost immediate available time slots), and the best warranty (unlim miles and 5 YEARS!). Also warranty transfers if I sell the car.
Everythings back to normal and all is well.