Definitely stick with a tubular mani, have you figured out anything else you want? The new 400lph in-tank walbro pump is pretty awesome..