Something like Test Track would be fantastic. To be honest, I assumed the turn radii would be too big for the site, but I measured the biggest turn on the EPCOT ride and it's exactly the same width as the Grand Prix site.
Personally, I would still like a Wallace & Gromit motorbike & sidecar...