Yep. Pioneer didn't bother differentiating between OVA 1, Night Before Carnival and OVA 2, which is why they just called the whole thing Tenchi Muyo! and nurabered it as episodes 1-13. Since FUNimation couldn't use Tenchi Muyo! as a title, they went with Tenchi Muyo! Ryo-ohki for the OVA 3 and OVA 3 +1 releases.
My understanding is that the license rescues were all fast-tracked since they had the least amount of work to do to bring them to market.
FUNimation does not have the earlier OVA's at this time. There's two schools of thought on whether they'd get them or not. At this point, I'm leaning to the school that says that FUNimation may get a distro-only license for the canon and non-canon stuff. That would disappoint me for the canon materials, because even though Geneon cleaned up the subs somewhat, they really need retranslating from scratch. I'd rather FUNimation perform a pure license rescue so they could fix the subs.