Chiff Warbler or Willow Chaff?

This was a lovely visitor to our pond this morning.  I think it is a young chiffchaff but they are so difficult to tell apart from willow warblers that I am hedging my bets with the title.