Go STI, especially since you already have them. It fits the era of the bike and the ease of use is significant. I think you'll regret having to redo cables and bars everything once you get your cable stops.