Just coming back to say I got a suit from Tuga in 6-7 that seems to have a long enough torso to fit for a while. I'm also going to order a pair of jammers which he can grow into if they are still too loose in size 22. Hopefully he will grow out of this phase before he grows out of the available brands.