Thanks for following up.

I only used Andy's schematic for the Q-Filter wiring specifically, otherwise I went with the ones from Phostenix as they are super clear on what is what.
And I am using a 22nF cap based on earlier recommendations on this forum. =)