There are a lot of right answers to your question -- Renata gave you a very good direction to head by replacing some of your OO. I'd try her suggested recipe, to be honest.
The old debate about the use of animal oils ... I don't really want to go there. All I will say is if you don't care to use lard or tallow, the local options might be limited. Check local organic food co-ops, bulk food stores, and Amish/Mennonite groceries. You might also want to consider a hydrogenated product like Crisco -- read the label for the ingredients, but I believe it's typically veg oil based and would provide fats in that "in between" niche.
Regarding water discount ... from my chemistry background, I just can't wrap my mind around the idea of calculating water as a % of the oils, so I don't have a handy number off the top of my head for you in the terminology you are used to using.
I always figure the amount of water and lye looking at the lye solution itself. I normally use a 33% lye solution (1 part NaOH to 2 parts water) for most of my soap recipes and it works well for me.