"Return of An Old Friend" cheapened Tommy's departure

I feel after the epic way Tommy was written out of the show in 'Green Candle', 'Return of an Old Friend' cheapens Tommy's departure. I'm not a big fan of focusing so many episodes on Tommy losing the green ranger powers. While the actual draining of the powers didn't occur till episode 7 of s2 'The Power Stealer' and ended on episode 13 'Green No More part 2'. The forshadowing and constant reminder of Tommy losing his powers had become a thing since 'Football Season' in season 1 and the effects finally showing in 'Mutiny' part 1.

I'm planning a Power Rangers abridged rewatch with my friends soon. Since it works better thematically I'm thinking about end season 1 at 'Doomsday' and skipping over 'Return of and Old Friend' and going straight to 'Missing Green' then 'White Light'. Since aside from the green ranger restoring his lost powers and losing his green powers and gaining his white powers nothing else of real consequence happens in the first 17 episodes of MMPR s2 or the Zyu2/ 20 episodes following 'Doomsday'.