If you aren't sure that you will enjoy the commute, I would recommend fixing what you already have i.e. new driveline, slicks, rigid fork ect. Then if you find that you don't like it (not likely, I know, but it is a possibility), then you aren't out a lot of money. If you do like it (more likely, IMHO) then you will have a better idea of what you actually want or need in you next bicycle.
As they say around here "The purpose of your first bicycle is to show you what you want in your next one." Beware of N+1.