I missed that suggestion bingowings. But it would seem to add a little gravitas to the whole thing if things don't quite work out for them.
The existing cut is too cookie cutter, A,B,C, by the numbers if you know what I mean. The heroes outwit Jabba too easily IMHO.
And you could still start off with Jabba's palace. Then go to Vader/Dagobah. Then back to Jabba's with Luke arriving.