If you wanted to keep it, I kinda like the idea of replacing Jabba with a hologram of the puppet version. In any of the movies, does anybody ever walk through a hologram? If not, then perhaps it's perceived as being disrespectful to do so...so perhaps if you could come up with a scene where puppet-Jabba gets sort of upset or jumps, you could use that as a hologram, with Han walking through him (at the point where he steps on the CGI Jabba's tail), and hologram Jabba gets kinda testy. It would work as a good example of Han's sort of hardass, "fuck you" nature, while at the same time showing him as not being SO stupid as to step on the real Jabba's tail.
Just a thought.