ID confirmation - MacGillvary's Warbler ?

This was taken in Oregon on Sept 7, 2014. I am not from Oregon and am not familiar with the west coast fall warblers. I looked at it closer recently and believe I ID'ed it incorrectly then as a Yellow Warbler.

I now believe this is a MacGillvary's Warbler . However, the combination of my inability, confusing fall warblers, and a picture from behind gives me pause. Plus, it would be a lifer so want to make sure for credibility!

Can anyone help confirm or deny my ID? Thousand Thanks.

Greg you have an Orange-crowned Warbler here. A faint line through the eye and yellow under-tail are a couple key points.