Bushwick, I still only see perspective distortion in both your photos. For your requirement you need a perspective control lens. It is true that perspective distortion can be annoying, and right, you end up losing a good chunk of the photo correcting it in software. But that's what perspective control lenses are for. I don't know about the Fuji system. For Nikon I have a 28 3.5 and a 24 3.5 that both handle this kind of a scenario. I know Canon has tilt shift lenses that do the same thing.
Or one tries to align the camera to a plane parallel to the one that the offending lines are in. Not always feasible though.