What calcium supplement should I use, calcium carbonate or calcium citrate?

Either. Just make sure you take the proper amount to balance with your diet and take 2000 units vitamin d3 as well, citrate is easier to absorb and doesn't need to be taken with meals, but can be more expensive and less "calcium dense" per pill.