Niki Lauda, Ferrari; James Hunt, McLaren