this one has an i5 and 8gb of ram
https://www.ebay.com/itm/Dell-Optiplex-790-990-Tower-Windows-7-10-Intel-Core-i5-Quad-C-DDR3-WiFi-HDD-SSD/232600569876?var=&hash=item3628130814
two options
1:https://pcpartpicker.com/list/8DT629 this is a buy it all now option
2:https://pcpartpicker.com/list/8DT629 drop the gpu and wait for the 20 series
yes i am an amd fan boy boy