I don't think edison and tesla had the typelogic "pal" relationship going on. More like "contrast" or something, and I am using my experience with these relationships, not just their supposed definition. So then my guess for edison is ENTJ.
The interesting thing is that I am rather sure that edison is an ISTp in socionics, and tesla is my sociotype. So whatever conflict taken place would be on the basis of edison ignoring Ti ways of thinking and focusing on the Te. (of course if you know Socionics like I do, you know what function position Ti is in for the ISTp, it is called demonstrative.) An ESTj or ENTj would not have the time or focus to poke at Ti.
Edison was in fact a "Te" ISTp, and Tesla a "Ti" ENTp. Semi-duality, but not so hopeful. Telsa had his ideas, and Edison was more focused on production, what in recent would come of the development of the invention, based on trend or such.
As far as Einstein and MBTI, I would say he is an INTP.