Do the adhesive strips for the 2015 iMac 5K fit on the 2017 model too?

iFixit sells item #IF174-005-1 which only shows compatibility with 5K iMacs through 2015. I imagine the 2017 models would be the same, but can anyone confirm compatibility? I have the 1TB Fusion drive and see the beachball all the time due to the tiny SSD. I'm thinking of upgrading it with an Apple 128GB or 256GB SSD and 3TB HDD but want to make sure I can seal it up again.

Thanks!

P.S. I have a 512GB Samsung 960 Evo which I would love to use, but from what I understand there isn't a good option to make it work internally (and I'm out of TB3 ports on the back so an external PCIe-TB3 solution wouldn't work). Is there anything else out there that I'm not thinking about?