You can use Goatein if it's working out okay for you. :) Raw milk is fantastic, and rice milk is a great sub for pasteurized milk or for those who are lactose intolerant.
You can use just the yolk if you like, but I like to use one whole egg because to get complete amino acids you need both white and yolk. But you don't necessarily want a lot of egg white because it has a compound that acts as a binder for absorption. So after one whole egg use yolks, like one whole + two extra yolks.