I have both catch up RRSP contributions as well at the employee RRSP match, of my own "regular" contributions...which ones should I include?

When entering your RRSP contributions- you will enter what you contributed- it will be on the slip from the bank. What your employer matched should be already entered on your T4 slip from work.