FUJI X100F with TCL

hi folks, i am just struggling with some shots of painting i got from the fuji x100f with the teleconverterlens attached. i feel the distortion / pincushion-effect in the raw is massive and the correction-tool makes the straight lines rather "shaky", uneven. i need the keystone tool as well since the camera wasn't positioned quite perfect and together its quite challenging to get straight paintings... is there another profile instead of the manufacturer-x100 for this? or any suggestion for a better workflow..?