Upgrading from an I5-3570k. Thoughts?

Looking to upgrade my I5-3570k cpu. I have a 1080 gpu and plan on playing at 1440p and was just thinking what peoples thoughts are on. I dont mind going Intel or AMD ryzen. Basically just a gaming machine only with perhaps some light streaming. I was thinking of an I5- 8400, but was wondering if i would notice a huge boost. Most games i play are BF1, PUBG Vermintide 2. Also of thinking of buying a Vive pro when it comes out to keep in mind! Thank you!