You should first attempt to get the correct area.
Why are you trying to do it in one piece?
The other piece is:
Reversing the order of integration will not help. You'll still need two pieces.
If you REALLY wanted to do it in Polar Coordinates, THEN you could take it out in one piece.