What is going on with Boba's Death?
Mabey have Luke slice his head off like Mace Windu did to Jango. It would be a much more epic death and it really wouldn't be that hard to pull off.
Or you could have him live and fight in the final space battle. Make a scene of him flying off from Jabba's Palace. I don't know how you would kill him off though. Probably the Falcon.
It would be easy to do this.