Thanks everyone!! I actually just stopped by the new FWC dealer in Colorado. Nice guys. They took a look and recommended a new pump. Looks very easy to install on my own, so have ordered one. If anyone wants an 2017 pump to play with, let me know!!
The faucet worked great. To Vic, I did...