If you take away their slam titles, Fed has 237 consecutive weeks at #1, the only player to reach 300+ weeks at #1. Won 6 WTF.
But it's pointless to remove the most important title(slams) and only compare smaller titles. Because you are stripping away many of Roger's records(eg most consecutive win on grass and hardcourt, 24 straigt win in the final...).
BTW, remove slam titles, Agassi > Sampras.