I think with your current cam you should be real close.
Since you have steeper gears you could probably go a little bigger on the cam, but I think you should be close to high 10's as is. My cam is a little small, but it works well and it's easy on parts.