HP 339a recap and modification

[EvanF]

Should I use Nichicon KL, KG, or Panasonic FM for the capacitors? Should I use LT1468 or AD797ANZ for U1 and U2 in the oscillator? Should I replace both U1 and U2? If I use the AD797, which compensation components do
I remove? Which ones do I remove if I use the LT1468?

Here is my parts list so far:

Pots:
(2) 3339H-1-202LF 4 turn 2k
51SAD-U25-A15L 1 turn 10k

IC:
AD797ANZ

Caps:
see attached