I posted what I thought was a Willow Flycatcher here: http://www.pbase.com/imagestruck/image/61108235
I am fairly certain this is a Willow because it has short primary projection, was found low in branches next to the river,and exhibited tail-flicking. If you believe differently, please leave a comment.