Well you're enjoying it, and that is even more important than the bike.

That is a nice distance for a commute. If something goes seriously wrong, it's not too far to push or carry the bike. It is enough to keep you in shape.

I changed having my breakfast at home, to having it at work. There was another reason for that besides the commute, but it helps with the commute. If there is a delay of some sort, it comes out of my breakfast instead of my job time. I don't buy breakfast at work, just pack it and bring it.

One other thing that is a big help. Get a second bike if you can. Some mornings when time is tight there will be a flat tire. It just takes about 30 seconds to unlock the other bike and use it.