Let's back up a step, are you sure your partial fraction decomposition is correct?

Once you are sure you have the correct decomposition, when you integrate, make the limits of integration reflect the substitution and you won't need to back-substitute for the original variable.