Michael should've dropped Working Day And Night and She's Out Of My Life from the set list (even though they are great songs) and performed Remember The Time, In The Closet and Can't Let Her Get Away.
By the time of the Dangerous Tour he had performed WDAN and SOOML on three different tours. That's enough imo.