I get to this bit
from here, can I not simplify the expression
Back to algebra class for you: you can't take the square root of each term like that. For example is , not 4. Or looking the other way, is , not .
When you make HallsofIvy's substitution, you get
which you should be able to integrate directly.