There's a strainer in the water line near the pump. Unscrew the cap on top and remove wire strainer. When new, they are usually clogged by small plastic pieces. This may be restricting your water pressure if this hasn't been cleaned out.
Sorry. Can't help you with the water heater problem but someone else on the forum will probably have an idea that can help you.
__________________
|