Need help with upgrading CPU

[VikingKing95]

I am wanting to upgrade my current cpu (fx 6300) that I have paired with a gtx 970. I have just got into pc gaming so I still dont know much about parts and upgrading. However, I know it is about time for an upgrade. I am torn between the ryzen 1600 or to go with an intel processor. I use my pc to play games and that is about it. If i upgrade, I am trying to stay in the $400 area including a new CPU, Cooler, ddr4 ram, and an atx motherboard. Thanks in advance for any help that you can provide because i could really use it.

 

[Supahos]

PCPartPicker part list / Price breakdown by merchant

CPU: AMD - Ryzen 5 1600 3.2GHz 6-Core Processor ($197.88 @ OutletPC)
Motherboard: MSI - B350 TOMAHAWK ATX AM4 Motherboard ($81.98 @ Newegg)
Memory: G.Skill - Ripjaws V Series 16GB (2 x 8GB) DDR4-3000 Memory ($121.99 @ Newegg)
Total: $401.85
Prices include shipping, taxes, and discounts when available
Generated by PCPartPicker 2017-07-24 22:35 EDT-0400

Can oc ryzen on the stock cooler pretty close to max. On this budget this is pretty much a no brainier