NAD 1000 preamp cap questions (signal path vs power filtering)

I'm preparing to recap my NAD 1000 and am putting together a spreadsheet of parts to order. I'm trying to stick to Nichicon PW for PSU and power filtering caps. For signal I'm going with Nichicon ES/KZ (WIMA films for really small values).

The PSU is fairly straightforward, all the electrolytics (circled in red) will be replaced with Nichicon PW.
psu.jpg


The headphone amp is also pretty straightforward (I hope):
headphone.jpg

The bottom half appears to change the rail voltages from +24.5/-22.5 to +18V/-18V to supply the circuitry in the top half, so the red circled caps would be Nichicon PW. The blue circled caps in the top half I think are all signal path, so Nichicon ES/KZ.

The preamp section only has three electrolytics per side (circled in red), and seem to me like they're all part of the signal path:
preamp.jpg

Does that seem correct?

The phono preamp has a few that I'm confused about:
Screenshot-2023-02-01-193353.jpg

C201 and C223 look to me like signal path.
C221 seems like it is probably power filtering(?)
C205 is ??
C215 seems like it could be considered signal path since it looks like it's attenuating the phono input based on MM/MC switch position(?).
C219 seems like signal path but I really don't know.

Can someone have a quick look and see if I've got any of this close to right? I won't be ordering for a few days but any help in the mean time any help is appreciated. Explanations are extra appreciated but not necessary.

Also, am I overcomplicating? Should I just use PW in the PSU and headphone voltage change sections, and ES/KZ everywhere else?

Thanks in advance!
 
I don't see a problem with any of your red/blue marks.

Power supply IS "in the signal path", and significantly for most discrete circuits. So while C205 is more a filter thing, I see no harm in using a sweet-sounding cap. Does it cost more? Enough to agonize over?
 
  • Like
Reactions: booja30