The Jabba and Greedo scenes were both in the script, there never was a Plan B scenario. Both made it into the Marvel comics adaptation, which was in the can before anyone saw the finished film.
The whole reason for the original human Jabba being cut has been murky since 1983, when that pesky storyboard of uncertain vintage appeared in the Making of a Saga documentary.