I thought the two time travel episodes in the latest SNW series, Tomorrow & Tomorrow & Tomorrow and Those Old Scientists handled it really well. They finally dealt with the sliding timeline issue for events that were supposed to be in the 90s during TOS.