As you said

Now for the last piece look for a decomposition as follows

multiply by

giving

expanding a group terms depending on whether there's a x or not

Solving for A and B gives A = 2, B = 6 so

although it doesn't agree with what you have in your denominator (above **).