I think you are right and they are together, but it wasn't interesting or whimsical enough to reveal that. Many of the plots have been Whitney going on a date with someone.
The porch swing was such a setup, I really hope they weren't planning for it to collapse.
I like Whitney and this show, but so much of it is staged or totally fake.