For the current wheels you're running thats perfectly fine tire sizes.
Could you run a way bigger tire? Sure but at what price slightly less nimble and heavier tire?
I think your fine with the current setup if it's not going to be pushed to the edge of it life.
And if you do the S04's should hold their own for the money.