EAD 6816 A, M-42, ECG 6604 A & B (Were any of these stock on a '55 Thunderbird?) (Are the specs the same for the 6604 A & B?)

Have read a couple of posts regarding the gerotor vs spur-gear pumps. 
http://forums.y-blocksforever.com/Topic124762.aspx
What would be your choice?
Rebuild the aluminum (not steel as Ted seems to favor) gerator I have in stock, or. buy a new spur-gear pump for a 350hp Y-block, or?





.150 Stroked Y-Block:327.25 ci @ >1hp per ci