The writers are giving me whiplash with their writing of Gabi and Sonny. I think the story is better when they both are in bitch mode vs let's pretend we're the happy couple in this 3 is company scenario

I agree. Sonny and Gabi work best when they're trying to out-bitch eachother.