Actually, I do not find that system to be outdated at all.
http://www.aqadvisor.com/
Yes, we have come a long way since that rule was made. And it isn't perfect. Some fish produce a higher bioload than others. Calculate that with there is not actually 20 gallons of water in there after everything else.
I think you are stocked right at the point of being full per recommendations.
I honestly would suggest starting another tank.
I was at the same point you are, and I wanted to add more fish to my 30 gallon. So I started a 10 gallon and moved some of my fish to it.