I ordered the water valve assembly, watched the video and installation was a breeze. What was nice was that this is the EXACT replacement for the existing water valve; there was no need to remove the extended assembly.
As for the funnel assembly, this was to replace the existing (and rather disgusting) funnel assembly. Actually looks pretty good now.