Should DHS focus solely on preventing terrorism or expand its role to disaster preparedness, too?

It has already been expanded to include everything remotely related to first response. That is why nothing (FEMA) works. Taking all of the bureaucracy and enveloping it in another layer of bureaucracy is the new concept of less government.