Yes this is also a Willow Warbler for me.
Similar Melodious should have pale lores, a stronger, not so pointed bill with more extensive flesh base, square cut tail, darker legs. Chiffchaff should have darker legs, not so clean yellow colours to the breast and a different head pattern. Bird looks good for Willow, and not like the few Iberian Chiffchaffs I have seen, they should show darker legs and I would expect them (all?) to be more similar to a Chiffchaff.