I have build the Amity with stock supply (1u/10H/100u) and on my 92dB/1W/1m speakers there is only slight audible humm with my head at <30cm from the speakers. Don't know how sensitive your speakers are.
I also have been thinking about a two-section filter, but since there is no need for it (in my situation) I did not build it. Something that I still want to try is 1u/2.5H/120u/100Ohm/200u. Looks good on the sim.
Anyway, I'd build by Olson's schematic first, you can always tweak later.
P.S. I just tried your proposal (1u/2.5H/47u/2.5H/94u) on the sim and it looks unstable to me.