time for a new torque converter?

alright, when my car was mostly stock (and i didnt know anything about drag racing) i got a 2200 rpm torque converter. at the time i thought it was amazing. a couple of years and over 400rwhp later my 2200rpm converter is a joke. my track times are embarrasing. last time i went, a vw bug raped me off the line but when the boost kicked in and the tires hooked i walked all over him but still....its embarrasing. i should be deap into the 11's if only i could get some power sooner. im thinking 3000-4000rpm converter would be a good route or maybe higher. i plan to up the boost and run methanol/distilled water and then add about 4* or so of base timing. hope to be in the 475-490rwhp range when im done. what company should i go with, ive heard a lot of complaints about B&M. also, is this a good time of a hardened input shaft? my car is a daily driver if that matters. lock up or not? i want to get into my high hp range immediatly.
major mods are afr165's, vortech s-trim, 3.73's and a bunch of other high rpm hp parts.
thanks

this is one area i know little about so a bit more help then that is needed

that web site says 3000rpm is the max you want for a street car....what do you guys think?

just talked to him 5 minutes ago. he told me to get a 3200rpm street edge lock up. not bad cause its only $500. i said i have a 2200rpm converter and he said its worthless. anything below 2600rpm isnt even worth swapping. i told him ill be ordering in january. christmas is coming so i cant really blow 500 before i shop and i have a big family.
thanks for the help guys