You did the right thing in turning the current adjust down a bit. Unless you are sure that the 40 amp breaker is faulty don't bother replacing it. NEVER ! ! ! replace a breaker with one of a higher capacity especially in an older house. The breaker is almost certainly matched to the current...
