What's the record of 2 people meeting each other in GS finals and tournament finals??

I have a feeling Graf and ASV would come second to Evert/Navratilova. They played 7 GS finals, and another 18 in other tournaments:

1989 French Open Clay (O) FR Arantxa SANCHEZ-VICARIO 6-7(6) 6-3 5-7
1994 Australian Open Hard (O) FR Steffi GRAF 6-0 6-2
1994 US Open Hard (O) FR Arantxa SANCHEZ-VICARIO 6-1 6-7 4-6
1995 French Open Clay (O) FR Steffi GRAF 7-5 4-6 6-0
1995 Wimbledon Grass (O) FR Steffi GRAF 4-6 6-1 7-5
1996 French Open Clay (O) FR Steffi GRAF 6-3 6-7(4) 10-8
1996 Wimbledon Grass (O) FR Steffi GRAF 6-3 7-5

Navratilova / Evert played 50 finals in total; 14 of which were GS.

Davenport / Hingis played 14, two of which were GS.