Good job! I consider it mandatory to be able to sail into one's slip. Unfortunately, the configuration of many marinas makes that easier said than done, but it can be done. Roller furling makes it easier. We usually drop the main somewhere near the harbor or marina entrance and then bleed off speed as necessary by luffing the genoa or progressively furling it. Sailing to your slip isn't a whole lot different than sailing to a mooring - both are just targets.
Our last boat, a Sabre 28, had a ton of gunk in the fuel tank. We sailed into our slip nearly every weekend for a summer before I got tired of it and had the tank throroughly cleaned.
Remember - people sailed around the world far longer than they've been navigating with engines. If they can do it, so can we. It just takes planning and patience. And a willingness to look like a fool - that helps a lot.