Stiffer charges in SWAT officer assault case