While I'm always happy to see Fornel, I'd be even happier to not see Diane again. I thought we'd seen the end of her when she married husband #3. Diane and Gibbs had already had their goodbye. Let the relationship just fade into the background.
This episode felt like a re-run. I even had to double check previous episodes to make sure that this episode really was a first run ep.
If you must bring back the ex-wives, why not bring back Stephanie, or better yet, ex-wife #1? Best to avoid the ex-wives altogether.