I had same problems with toms this year. I removed all leaves and cut out all diseased stems, etc. I removed all suspect tomatoes leaving the healthy ones. I already had a heavy crop....albeit green..... But I am picking every day and they are ripening quickly. Sun on tomatoes and plenty of air circulation seems to be the solution, for me.