I think you could fit more in there. You have plants which the stocking calculator can't take into effect. You would have to detract some because your tank is taller rather than wide (less surface area). I think you could have 2-4 more guppies if you wanted without problems.
I agree on waiting a while before adding them. You wouldn't want a mini-cycle.
*Be smart.. Do your research!!*