For God's sake, don't put in a 2L or 3L by replacing the excellent 13B. Add a turbo, but you must find out what gear and diff you are using first. Go to a mechanic, they should be able to tell you. You are right, your problem will most likely be a bad combination of your powertrain.
Rao.