If I can make a humble suggestion, fix everything now, or at least as soon as possible. This may be rough finantially, but remember, "enthusiasm diminishes with time".