Roof rust repair

About a year & a half ago I had a body shop do what I thought was a rust repair on my roof. I just bought my X & the roof had rust all in the roof ribs, lots of cracks in the paint in the crevices as well. It looked good. Until this summer when I noticed the rust was again starting to come through in these areas. I guess the body shop didn't do it right, what can I expect from the $200 they charged me.(seemed way too low)


So what can I do to fix it? Or maybe stop it & then repaint? I more worried about the roof rusting holes & leaking. One shop told me they do not do rust because they can't warranty it, another said I need a new roof because it will need to be cut off & welded back in.
EDIT: pics

 

[MONMIX]

you cant stop rust.
( watch the avalanche of arguments follow )

You can slow it down however. Can you post some pictured so I can see how bad it is ?

 

[Jason94sport]

pics posted

 

[MONMIX]

thanks.
Thats not bad at all.
It can be sanded to bare metal maybe one or two inches beyond the rust area. It doesnt look to me like its goes too deep.