I did find Huggles became a poor fit on Charlotte. I had to really boost them and then either I struggled to do up the poppers or they were gapey.
I have heard of people putting 2 Bamboozles on together to go overnight
I moved from Huggles to Stuffies fastened with a nippa as this allowed me to get a better fit - perhaps you could try a nippa on your huggles? But actually have now found that the Night Notions are an even better fit with the side snap.