Right-wingers to march through Jaffa Gate instead of Damascus Gate during Tuesday's contentious event, but still plan to dance with flags outside flashpoint entrance to Old City