I went i5, just because I have no use case where I’ll be needing extra performance. I have my 5800x on my desktop for pretty much anything CPU intensive.
One thing I’m curious about is multicore workloads. I saw a couple reviews stating that the i5 can sometimes outperform the i7 in some all-core benchmarks. i7 obviously trounces it in single core workloads - which will matter more in the vast majority of use cases, but if you’re using it more as a desktop replacement and have some intense multithreaded workloads probably worth checking. FWIW I get about 5423 in Cinebench R23 with the i5.