Sounds to me like you need to get your axle checked over thoroughly to make sure that it is not bent, the upper ball joint hasn't been screwed up and make sure your drag link is adjusted properly. If your control arm was bent badly enough to need replacement then there was probably other damage as well. They may have fixed what was readily apparent without checking further.
You say it doesn't track right, I would also have the frame alignment checked out. I had a CJ-5 that didn't track right. The PO told me he slid off in a ditch while going down the road but it was "ok". After I drove it for awhile I knew there was something wrong with how it drove. Took it to a friend of mine's frame shop. The frame was tweaked and needed to be straightened. He fixed it and it drove great after that.
I hit a rock with my TJ and knocked the front end out of alignment. The Jeep dealer said they could align it, but there would still be a slight pull. They said the upper ball joint needed to be replaced. I had them replace it, align it, and it drives perfectly, and the steering wheel is aligned like it should be.
In short, by your own description, I think you have more hidden damage than you realize. I would get the axle checked to make sure it isn't bent, check the ball joints, and if the problem is still there, I would consider getting the frame alignment checked. When you hit something, the weakest point might give, but the energy from the hit does transfer throughout the vehicle via the frame, axle and body.