Forget what people whine about, bottom line is the lava duel is WEAK and needs drastic editing / cutting if you want to save this movie.
Do whatever you think you need to do to achieve this.
"When I left you, I was but the Jedi master with students of my own..."
Personally I prefer the idea of them being split up and Obi finding the saber and taking it, strolling off.