Thanks for this, the “Pagination fix” bit helped a lot!
One thing - I had to change where $paged is declared so that it gets the ‘page’ var, rather than the ‘paged’ var. So:
$paged = (get_query_var(‘page’)) ? get_query_var(‘page’) : 1;
This is using WordPress 4.7 and a child theme of Twenty Sixteen.