Just turn the Guadalupe into a concrete ditch like Los Angeles did to the Los Angeles River.
That will make it safe.
Safety first.
It kinda already is.