The latest Lightroom upgrade also has an easy-to-use perspective correction tool which you might find helpful.
http://www.lightroomqueen.com/whats-new-in-lightroom-cc-2015-6-and-lightroom-6-6/
I just discovered that AF-L doesn't work in autofocus mode with face detection turned on. It was frustrating, but after I turned face detection off, it worked perfectly. Apparently Fuji knows about this.