But as stated before, him going back to the teen titans does not automatically mean they will go pass his man vs machine scenario, it just means he will be associated with a team that classic readers have a more nostaglic form over. This is not a 1+1=2 scenario, meaning him going back to the titans does NOT mean they are "forced" to do something with him. They can window dress him and make him a background character. They can give him the original wally west treatment, they can do many other things that are even worse than what he's currently going through right now, and that's why I say him going back to Titans is not the answer.
The answer, quite frankly, is to write him right, which means expanding his powerset to where he's not made to just get broken, make sure he's showed to be on the same stage as the justice league and expand outside of his man vs machine role, which can easily be done in his own solo series.