I used to design phase controlled commercial battery chargers many years ago, and looking up my old design notes, you need something like a 5.7mH choke for a 36v 15A battery charger.
That will definitely solve your current spike problem. You may or may not also have some commutation problems with a triac under certain conditions.
If so, back to back SCRs will eliminate that problem.