It's ok. Ended up ordering a surly cog, surly chainring, and new chain.

Chainring is probably overkill. Maybe I will just not put it on, and if all is ok, I will send it back. Wanted to have it just in case.

Hopefully it's quiet, and smooth. Then will keep my eye on it and keep it much cleaner and better oiled.