My only suggestions would be first, to try to use the Tamiya glue only to glue parts together before painting them. Secondly, after painting, use CA glue to attach parts sparingly, using a toothpick to apply the glue so it won't "squish out" onto the painted surfaces.