LBJ

I need your help.
I was captivated by this little bird. It was very busy. In fact it was difficult to get a photo of it because it was moving so quickly. I am not sure what it is though-my guess is either a chiffchaff or a willow warbler. Please put me right if you know better