I agree. If you down a tablespoon of extra virgin olive oil, that's 14g of good fat right there!
As for the whey protein as a meal substitute, as CowPimp already said, it would be a good idea to use other foods to create a shake in conjunction with the whey protein. In my opinion, 2 big meals is too many to be substituted with whey protein shakes (one is okay). When I make a shake with whey protein as a meal substitute, I throw in cottage cheese, oats (you can't even taste them so don't be shy of trying this), fruits (strawberries, bananas, and/or blueberries), and milk. It really depends on whether you are trying to lose or gain weight. 20g of fat from fish oils is a little overboard though, I think the most I've gone up is maybe 12g/day on a bulk, and I took it back to 6g for most of the bulk. My guess is that you're looking for other fat sources? Try natural peanut butter, it's great.