Popped off the lines and drained the system: filled, purged and repeated for good measure, after the first session of the flush it almost eliminated all of the noise and issues.
Has been working great to this point, only 2 sessions of water time, but working well!