Arghhh....just did something that hopefully doesn't come back to haunt me.
Ended up calling BA, separated the PNRs, booked the F for wife, and kept the J for myself. If another F opens up, great, I can grab it, if it doesn't at least she'll enjoy the F, and I can just enjoy J. I really thought I was done with these adventures, but I guess not.