Just remember when patching the spar that you can't just stick in a piece using butt joints. Use a kerf (angled) splice or a lap joint and try to add doublers of thin lite ply where you can. You never said so but I think you've got A&P so think back to your basics.