Upon further inspection I agree that this should fix the heads up issue.
To use these fixes for each street (f, t, & r), duplicate cnt_x_face_xr and the three under it (_call, _raise, _fold), and rename them as you desire. Replace "(holdem_hand_player_detail.val_x_raise_aggressor_pos > holdem_hand_player_statistics.position)" with "((holdem_hand_summary.cnt_players > 2 AND holdem_hand_player_detail.val_x_raise_aggressor_pos > holdem_hand_player_statistics.position ) OR holdem_hand_summary.cnt_players = 2 AND holdem_hand_player_statistics.flg_blind_s))" where x is the street in question. Save the new columns. Duplicate the stats, change the names and columns so that you have a slightly different name and it uses your new columns.
I'll make sure we get this in our list to be fixed for a future release.