I was checking out the NUC11PAHi7 in the past week and it is the one I would pick to replace my NUC8I7BEH if I needed to. Single core speed is 2.8. Was actually thinking of getting one now so its available when I need it.
Check out this post from @David_Snyder as he built one recently.