Hey op! A friend of mine with a similar issue found incredible success with sleeveless short-leg leotards from amazon. It could be his night time hero suit. Her one son had issuses with digging and the other discovered himself just as your son did. Sorry for the crappylink but something like this.