I haven't really been following this, but have you given any thought to cutting Fett from the film completely?
It's always bugged me that he does nothing in ROTJ. On top of that, he's a bounty hunter - what's he doing chilling at Jabba's palace when he should be out hunting bounties?