This is how I felt before this update... Berry farming was so broken if you didn't want to do it (which I never did) there was not a lot you could do to keep up.
But there's a lot more ways to make money other than what you are used to I guess, i don't do any of the things you've mentioned and have made enough $ to not need anymore (buying RP is definitely not the best way to make $) .
Also I'm pretty sure now amulet coin has been changed you get more money, you just have to spend a few mins hunting for a couple amulet coin before your gym run...