Yeah, the FR-1 is what I need and was planning to order. I checked a nearby REI and Performance Bike and neither had it, so I'd have to order one or go further into town to an LBS. I have the FR-5 tool but didn't realize this was a different design until I tried fitting it on last night.
I also have a chain whip so I'm going to give that a try today. Thanks all for the tips!