Reply to Rate 'Em (Soundcard Upgrade Time)

I'm looking into a couple of possibilities for a Soundcard Upgrade. My needs are simple:
A) 4 Outs, separate volume controls on each pair as I use the card for all computer needs (so I want a knob to control the volume) and of course cuing.

B) 2 Ins, XLR for a mic and 1/4" for instrument, or running a stereo input through both. Obviously I need a Hi-Z for the instrument (bass!) with a LOT of gain as I am a passive pickup guy.

C) Midi I-O.

D) This is for producing, too, so I want good A/D converters that will provide good quality inputs.

E) I am more inclined to go USB, but Firewire is an option.

F) Size is not really an issue, but for EDM, I don't see myself needing 8 ins and 24 outs, so a small box seems in order.

So far the choices I am aware of are the NI Kontrol 1 and the Focusrite Saffire 6. I am leaning towards the Saffire as I like the TRS and RCA for outputs, but I am really in the dark about them as a company and how good the quality is (I read bad things about their drivers...).

Currently I use a NI Session I/O for the most part, but no Midi and no 2nd stereo channel are the killers. Plus it's Hi-Z gain is a bit weak as I have to max out the gain and boost the s/w gain to get a strong recording signal. For mixing I use a A2DJ which is great for that purpose but with no ins.

Any opinions or other suggestions?

Phil.