Yep, I'd wait at least a month or two. Prices should drop.
I bought the 3600 in July. I am incredibly happy with it. Personally I wouldn't even consider getting anything else, unless you really need the extra cores \ threads.
The 3600 provides an incredible price to performance ratio. I'd get the 3600, or the 3600X or XT.