The R7 2700 would be the better choice for you, if only because of the fact you can drop it onto your existing motherboard after a BIOS update. The i7 8700 would require a new motherboard as well. The Ryzen chip will do a bit better in streaming, and with Intel's current supply shortages, will probably be cheaper even without factoring in the motherboard cost for the Intel chip.