There is a glasflugel tech note on the 17m Kestrel about a mod to increase tha max weight of the none lifting parts by 12kg, it involves reinforcing the spar stubs around the pin bushes.
It would be worth looking in to at the weights you are proposing.

http://www.streifly.de/TM401-14.pdf It allows an 11kg increase.