I voted for i7 9700. You get 8 real cores, never mind the hype about threading with 8700, so it's faster and with both being 65W parts it's a pretty sweet upgrade.
Here's a comparison from CPU world.
Edit: I'm sorry - didn't read the whole topic before posting - I'm sorry to see that you've...