I gave him to the FOA and when he was returned like 3 days later he now won't attack and will just follow me around doing nothing. Such a great "weapons upgrade".

If you are on PC, you can try opening the console, clicking ED-E and typing

additem 001694DF 1

You might have switch between his melee and ranged weapon once and fast travelling somewhere for that workaround to work properly.