New F1 track deal 'as good as done' as calendar set for another new circuit