There is a way to fold a double pass NATO strap and you simply start with the watch further down the strap. It's difficult to describe from there but there are videos on it that will show how it's done.
Yeah I tried what you said and ended up putting it the way it was because if I remove the excess the buckle ends up in a really uncomfortable position on my wrist
