I found this blog post very useful when I was looking into a similar issue to the one you encountered:

https://sqlserverscotsman.wordpress.com/2016/11/24/troubleshooting-query-regressions-caused-by-the-new-cardinality-estimator/