It looks like he did:). I would slightly rephrase this sentence: "John Griffiths was waiting for Charles's car in which he had promised to drive the Simpson's girls home". "He had promised" - use past perfect aspect here because he promised before he began to wait... Cheers.