Well I'm back, 6 months later, with an update that it is FIXED! The first plumber I had look at it wanted no part of it and never called me back. The second guy looked at it and said this is not a big deal. The attached pic is what he did. After installing the new configuration, he carefully adjusted the pitch of the drain pipe above so everything was sloped correctly and in spec.
It's been 10 days since the repair. I've had the cleanout open a number of times to umm "observe" and everything appears to be working as desired.