New Horse with serious issues - help

My sister and I went to a sales a couple of weeks ago to buy some tack for one of our horses. We ended up rescueing a 9yo thoroughabred gelding. He wore a hole in the concrete weaving, was stick thin and absolutly covered in cuts and scrapes. We've had him for 3 weeks now and he has put on so much weight it's like a new horse. He is an absolute sweetheart and gentleman. He has been really badly treated - if you go near him with a whip he freaks out completly. This I can deal with. The big problem is the weaving. At the moment it's not to bad cause he is out 24/7 and he will stay out as long as poss. but it is likely that he will need stabled overnight for some of the winter and I wanted some ideas on how to help him relax in the stable. I have anti weave bars up, a mirror for him, licks, plenty of forage and we are working on making the stable a good place - I feed and groom in the box and generally try to give good experiences inside, but he is still weaving constantly and excessivly.

Before you have to stall him I would start working on the problem now. Do approach and retreat. Pay attention as you approach to his thresholds. If he starts to get brassy, stiff in the body, then stop let him stand there for a minute and the moment you sense any relaxation in him whether his head comes down, takes a big breath, muscles relax, then turn and walk away. Let him rest when he is standing as close to the barn as he can handle. Keep approaching and retreating till you can bring him closer and closer. Do this every day till he is comfortable to where he is not feeling the anxiety. (Which is what weaving is caused by...anxiety) You don't want to try to distract him from that feeling... you want to deal with the feeling.