Your rpm is probably about where you want it and your economy will be better with a A than a B. Since you will probably loose a little rpm with the rebuild I wouldn't go with anything bigger. Who do you plan to have do your pump or are you going to do yourself?