ID Help, Please.

The images below were taken at about 6:00 am on July 16th in my back yard about 12 miles south of Olympia, Washington.  The habitat there is a small copse of Douglas Firs 30-40 feet tall.  I've created a pair of small pools with drips there.  This bird was bathing in the larger which is about 2 feet by 5 feet.  My first guess was a Common Yellowthroat juvenile, but I'm kind of leaning toward a juvenile Orange-crowned Warbler.

The bathing image is probably pretty useless for ID, so I've added a better view in the comments though the image quality isn't there.  I was at 1/25 sec and I suspect the bird was moving a bit at the time.

Any help would be appreciated.

Thanks,

Here's the pre-bath view.  You can click on it for a 1200 pixel version.

This one lacks an eye ring so I thought that may be a good clue because the orange crowned warbler has a more prominent one. But these seem to appear with age. Based upon coloration at this young stage I would agree that this an orange crowned warbler.

Orange-crowned Warbler.

Thanks, Richard.