A thorny question and one other

I read with interest Adam Bassett's post on the thorns. I seem to mainly get September Thorns in my garden. Here is a recent one.

However, this one caught on Tuesday night in my garden had its wings held lower, the wings looked more veiny, and the inner line looks more sharply angled. So, is this an August Thorn?

Finally, away from thorns, is this moth below a Square-spot Rustic?

Steve Trigg, Cookham