Macross Plus: Deculture Edition, I bet some bored fan with the proper hardware/software will put one together eventually.
Personally I like them both, each have strong points and some weaknesses as pointed out. Personally I'd like to see the extra scenes/slightly different viewpoints from the movie spliced into the OVA and leaving the overall OVA's structure itself intact.
On a side note, I think I watched eps 1-3 about 20 times before getting to see part 4 that wait was killer.