FF800 converters (RME Babyface)

I have a mackie onyx 1640 and will be upgrading soon, should I get an RME and get an additional set of preamps? or upgrade to the onyx 1640i? I only need around 10 inputs so what RME combination would be the best (including preamps). I am getting 2 golden age pre 73s so only need an extra 8 preamps.
 
Dont buy the 1640i.....the preamps are ok, and the 1640 was stabil at my end with osx and windows.

But you are damned and cant upgrade.
If you want something realy good and absolutly pro, go for fireface.

If you want something absoluty perfect, go with metric halo, or apogee and the even more expensive ones.
 
You guys have really got me thinking about ditching the 002R and getting a Fireface 800. I was planning some good preamps, but this makes way more sense.

Couple of questions. I assume the preamps are better than the pres in the 002R by a mile? Anyone using the FF800 on a Mac with Pro Tools 9? (Jeff?)