aschrei

Others have lifetime warranties as well, infact since there are only a few RAM manufacturers it stands to reason.
 
3600MHz is the sweetspot for Ryzen 3xxx, so the 3600MHz will be good and you can tighten timings with some tweaking.
 
Also, if you routinely use near or over 16GB then 32 is fine.  I go over 16GB often, it's not uncommon.

I would avoid buying 32GB of ram for your use case, it will go unused MOST of the time. As for the ram you have already, thats a tough situation, its so similar to what you would buy now. Depending on the quality, you may be able to overclock it to 3000/3200mhz, if you can then just keep that. If you cant get it past 2666, then I would go ahead and upgrade, Ryzen benefits so much from fast memory. Buy a 3200mhz 2x8gb Kit, it should only run you about $60 USD. You will likely be able to OC this to 3600mhz, so I wouldn't bother buying a 3600mhz kit. 

As Larri stated, 32 GB is a little too much for your use case. 3200 MHz is the sweet spot for ryzen. I would purchase a Viper RAM set because of their lifetime warranty. Having a 2x8GB will allow you to get extra ram if needed.