Accidentally Disabled Autologin & X Desktop at login, help!?

Hi,

I'm using a Raspberry Pi 3 running Ubuntu MATE for arm. I'm close to finishing a project, and wanted my python application to start automatically on login. I was finally able to get that working using systemd, but then made a critical error of going one step to far. Ideally I wanted my python application to start without first booting the desktop, so I tried the following steps:

However, what I didn't realize is that this would break auto-login, so my systemd setup to run my script is now failing. My script use py.game for a very simple GUI output, so I need to be able to login and use the X window system. However, regardless of what I try, I'm not able to restore auto-login and the x-desktop. Booting straight to my script isn't that important, but I absolutely need to start my python/gui on boot! Please help me undo these steps!

Thanks