Like the others said, I'd go for raising the existing stem 2", maybe even 3". Replacing the brake-levers with aero types and new teflon-lined cable-housings will improve braking tremendously. The aero-levers have more mechanical-advantage and will yank on the brakes harder for the same lever-effort.

And lower the front of that saddle, looks painful...