I'mthinking of doing the same - although just going 32gb on memory. Amazing that for the same 8gb-16gb upgrade on Apple's site ($200) you can go from 7gb -> 32GB using OWC. So glad Apple has user-replaceable memory on the 27" 5K iMacs!
Last generation I fear, so enjoy.