Both of the upgrades do not justify the motherboard switch in my point of view. In your case I would rather pick a second hand i7-7700k.
To justify the motherboard switch, I would aim for i7-8700k or Ryzen 2700x, Ryzen CPUs require DDR4-3000 or higher RAM for the best performance though...