The UV layout right now looks good enough to be used as a light map. Break down some of the bigger pieces, and give enough room between the different UVs and it should be good. Hopefully you keep it, before re-positioning the UVs again. Apart from that, and what everyone has already said, use tiling textures, and overlap…