So between 9.5.5, 9.6.1, none of the stats changed in a noticeable way. Changing the statistics target on 9.6.1 slightly altered the estimates, but nothing to write home about.
All have some significant deviations from actual row counts in the part of the query which is making the query slow.