I'm a little hesitant to say Rivian is playing catch-up with their EAVs launching in the next couple of months where Ford had announced mid 2022 for the Lightning, and that assumes no delays and you're at the front of the line. If the "future" Lightning meets your "current" needs, then it probably makes sense for you to wait.
Personally, with Rivian's current target segment of the adventure vehicle owner, it's hard to say where V2H or V2G is on their list of priorities. I think as V2H/G gets discussed more, especially from the Rivian crowd, it can only increase the chances Rivian implements one or both of these features sooner than later. However, if to support these features requires hardware changes, then I doubt they would be available on the R1 series. As I've mentioned to others there's nothing like telling Rivian directly. If you haven't already, I'd encourage you to express your specific needs for an EV directly to Rivian. Send them an email. Call or chat with their Customer Support. Log it directly with Rivian. And keep after them!