As for editing Greedo, well, you could have Solo say "I don't have it with me", and then tweak Greedo's subtitles to make him say something that goes over into "he may only take your ship", but I can't imagine a seamless way to do it. But that one line about Jabba's intolerance for lousy smugglers is really the only "sore thumb" in the whole business.

Can't really edit it out of the next scene, as it would show if Han suddenly stood at the right of Jabba's in the next frame ;)

So ultimately, leaving out Jabba completely would still be the best choice for the movie. Which they did in 1977 :D

PS:
Here's a scene that should've stayed out, though.
http://www.youtube.com/watch?v=vaUsa14SYsg#t=98