For what it's worth, replace the thermastat. Solved all my problems with a new T-stat. Sometimes they get stuck and don't open fully which can reduce the waterflow. When testing by just seeing if the hose above it gets hot (T-stat opening) you really don't know if it is opening fully. They're cheap at $25. Replace it anyway and see if that makes a difference. Worked for me.