Yeah, I'm surprised there's so few of these Tifas around. Either most people just shove her to the background, or hand-wave all of these issues and shove her at Cloud... she never gets there on her own.
Busting heads is always approved.
(And yeah, it's game Johnny! I always figured he deserved some more fanspace, since he's for all intents and purposes the Third Nibelheimer Who Lived, even if it's only because he wasn't there to see the shit hit the fan. And he never got Tifa, yeah, but he did get an eternally bathing girlfriend!)
Just in case you want to see more of this, I've written a continuation of sorts at my IJ.