Depends on ND mode for me. Track up during map mode seems logical since that is used mainly for LNAV operation and heading up for VOR/Approach mode makes most sense to me.
Well, might just me getting used to as i have flown that way for the last eight years. Just wish the heading bug had a function to be put onto actual heading during LNAV instead of that twiddling around until you hit the heading pointer.