Yes, your before/after schematics look good to me.
And good to hear that it has an effect, too!

I just think it's pretty freaking amazing what a few resistors here and there can accomplish! Thank-you Mr.Ohm for laying down the Law! smile

Cheers