[Build-It-Break-it]

All of options seem like they would work but would just be putting a bandaid on it. It would be a lot more work to cut the entire square tube back out and fix it the right way but it would be cleaner and you wouldn't have to think about it or question the repair later.