Dan - that's exactly the same route I went with on Rhapsody. Everything smells good now.....New hoses and head all the way, and replaced Y valve.