Well if wanting to invest in new might it be the right time to upgrade the whole system,but if you want to keep going with what you have could you look at these two,
https://pcpartpicker.com/products/compare/bJK7YJ,4Qx9TW/
the more expensive is the better choice.
About the ram,i get the idea that even those 2 sticks of 8gb weren't from the same set? When combining so many different sticks would you probably have to do a clear cmos to make the same amount/value sticks work together again,also might need a little boost in the voltage if they aren't already using 1.65V (which is the highest amount you want to use safely).
You can try to give a litte extra voltage and loosening the first four timings to see if the other two sticks will play nicely,but 16gb is a fair amout of ram for normal use and games.