Okay, I had the toilet flush, waterfall noise on hard braking. I removed, cleaned, sanded both discs, with some positive results, but the problem still about 50% there.
Next, I ordered resin pads (link in this thread), and put them on this AM. I never changed pads, so it was a bit of a slow go, but a very basic job. I cleaned discs once again. This time, I did the bed in myself.
Lots of info on bedding in, but I followed mainstream advice, and after I was done, WOW. Great braking on my Rize X, zero noise. Problem solved.