Last spring I was crossing a river when the ice I was driving on under water gave way instantly leaving my FJ60 helpless and submerged. It remained submerged until the following day when I was able to find someone to help retrieve it. Once on dry land I drained a large amount of water from the engine, gas tank (No gas cap!), and other running gear. It started right up and ran perfectly on the 45 minute trip back home. The following day it wouldn't stay running without the choke and it ran extremely rough below 1500rpms. It has been this way ever since. I've rebuilt the carb, changed the fuel filter, and checked all over for vaccum leaks but I've come up with nothing. I've been thinking about buying a weber carburator which would help me eleminate alot of the vaccum lines but will that really fix my problem?