You could also look at the peeling technique since your assets have alot more geometry in them, it will probably be easier to edit.
Basically you can place pins on your uv segment which controls the overall shape. The vertexes you have pinned will not move when you stretch the segment or whatever.
This mightn’t be the answer to lightmapping though!
Your project looks great btw!