Decided to split the PNRs. Got a good 1K agent who managed to keep all our upgraded flights and the waitlisted flights in good order ^.
I will let you know how it all goes, (if) when it clears

.
Datapoint: I was again told by another 1K agent, that the waitlist is definitely NOT FIFO anymore. Its status, fare paid and time on waitlist. This has been confirmed to me at least 4 times over the last 2 weeks. There is still a PA waitlist but everyone wanting to upgrade either with SWUs or Miles+Copay go on this list, according to the agent I spoke with.