Based on your advice, I just went on ebay and won an auction for exactly the same RAM I have now, 2x4gb 1600, not just the same size and speed, not just the same maker, but the same model too. It's identical and will fill the two spare slots nicely.
EDIT - If CIG then says I need 24gb of RAM I...