Try sparkpeople.com they have an app for droid that you can track your meals and even enter special things you want to get a specific amount of (for me its calcium)
If you are drinking shakes, you may want to gently and slowly stir them, make them the night before and mix lightly just before drinking, or let them sit for 30 minutes or so after blending/shaking. The blending/shaking can add lots of air and make you feel bloated.
myvega.com has a Canada site. the performance sport has 25 grams of protein and does not contain the "evil 6". They have single serve packs that you can order to try them out before you by a $55-$60 container.
Look at the Vega Proformance Protein it has more than 20g protein and you can order single serve packs to try the different flavors.