Motor Show 'set for a return to the capital'