If you get a new fork, make sure to get one with the same rake as the stock one. Otherwise it will totally ruin the feel of the bike that you like so much. I wanted to do the same for my pista, but I couldn't find a fork with 28mm rake for the life of me!
Good luck.