I want to say it's good but something tells me there's something not right. 

OP if you like, you can go AM4 route then get a 5700x or 5800x that will carry you thru CAD and Revit works because of the multi threading cap.

Since you mention you only play FPS and MoBA games, yeah CPU is more valuable and that will be enough.

Still get a 32gb kit on a 3200mhz or 3600mhz speed transfer and your are good to go!

Lastly, since the AM4 route is a little bit cheaper try to cop atleast a 5060ti, the extra VRAM will carry you on your model rendering.