I have done what you did, replaced
AP4372971 (6-2040130) Tub bearing kit
AP4390013 (6-2095720) Mounting stem repair kit
The leak stopped completely.
The high pitch sound at spin cycle is still there.
If you find any luck, let me know.