Oh, **** it. I pre-ordered two of these. 
Plenty of time to change my mind, but for now I'm planning to make room for one with ROTJ Jabba & crew and one with TBOBF figures... assuming they do more than just Boba, Fennec, Mando. Bring on the Gamorrean Bodyguards, Black K, 8D8, and heck even the Mod kids I guess.
So I was thinking about this today. I did the same thing as you Jeff and ordered an extra one for ROTJ, but Hasbro’s recent track record has me expecting that a Jabba specific version could follow this one within a relatively short while. What do we think the odds of that are?
I haven’t looked at photos of the throne room between ROTJ and BOBF… are there even significant differences? I’d love to just open two and be done with it, but if something more accurate is coming out later I’ll leave the second one boxed up for now so it’s easier to flip later to pay for the hypothetical second version.
My plan was to open one for ROTJ and then see where we are at with BOBF figures before opening the second one. In all honesty, I thought we'd be farther along in TBOBF figures at this point than just Boba Fett and Fennic with Krrsantan/Bib
Fatuna on the way. I'll likely keep the second one sealed in case I need to flip it if there aren't enough TBOBF figures to make a second display worth it.
There were some rumblings that a 40th Anniv ROTJ Jabba the Hutt repack of the one that came with the Barge is coming to support this set, but that may have been people getting wires crossed with the Black Series Jabba repack that was announced.
I know Hasbro loves double-dipping but I thought Emily and/or Chris was on record saying this one was designed to be used for either TBOBF or Jabba (in one of the videos they did, they showed what Jabba looks like on the dais) and was likely a one-shot deal. Double-dipping a set like this at $230 seems like a big ask... but then again they keep double-dipping that $200 Slave I so I guess it's possible.