Just like the right answer to "when should I let this person go?" is the first time the idea of firing him crosses your mind, maybe the right answer to this situation is the same: You should be looking for a new opportunity and move on the first time that idea crosses your mind...

When you think something is off, it usually is... and waiting on it will not change its trajectory.