Create a composite column with the following template:
Code:
{#custom_date:'ifempty($, field('timestamp'))'}
replace #custom_date with the name of your custom column. And choose sort column by date. This column will show the value of the #custom_date and if not found will substitute it with timestamp.