Yup, going with the RobbMc pickup/sending unit and their fuel pump. I also like that the sending unit will allow me to hook back up the vapor return line my car has.

Now all I need is someone to install (hint, hint)