Self-consistent modelling of charged and neutral particle dynamics in short-gap helium and hydrogen discharges