Would definitely recommend switching to a wool cover (not the BBH one, as the elastic tends to leave marks on legs too), you'll get more 'wear' out of your nappies that way as they breathe and evaporate some of the moisture.
I'm impressed at your kid's wetting abilities! I thought DS was bad.