Overheating Ryzen 2600

[Siriusss]

Hi guys i build my first computer and been using for like 6 months still coudn't figure out what to do about cooling i have ryzen 2600 with stock cooler and it overheats with light overclock 3.7-3.8 ghz i remember seeing 94+ celsius in BF5 it's clearly not normal i tried to disassemble and assemble again nothing changed now im using it with auto settings it's runs at 3.6ghz i tried running Cinebench r15 4 times in a row (i got 1124cp) to see temputure it reached max 87 celcius now it's idle at 46

 

so i definitly need cooler i look for 240mm aio coolers they are very expensive so i found this air cooler Cooler Master Hyper 212 Black Edition should i buy it? and do i need to buy extra thermal paste? is there better choises? and how can i clean old termal paste came with stock cooler please help

Case: Corsair Spec Delta RGB
Motherboard: MSI Tomahawk Max