Yeah, I'm going to try and recreate the original wipe where Jabba is in the SE but if I can't pull it off convincingly, I'll just leave it.
As to Ben's lightsabre, I didn't rotoscope it, I just increased brightness and contrast, just like I did to fix the lightsabres in ROTJ.