I just wanted to close the loop here in case anyone else is having a similar issue. Shocker, it ended up being the actual diverter valve. I did replace the bypass check valve. After doing that, I opened the bypass again, cleaned everything, added lubricant to the O-Ring and did the same thing...