I’d definitely recommend switching to a proper source control system. The versioning features are invaluable.
Git and Perforce are both popular. I run a Perforce server at home for development, and then push stuff I want to publish from there into Github.
Perforce has the advantage that it’s integrated pretty well into the UE Editor, although I believe there’s a Git plugin for the editor, although I haven’t tried it.