After putting all the above together to post, I managed to get the modern 30-30 barrel off the gun and get the octagon one on.
I added some sights that could have been ordered on one.
It still needs some work on the forearm; plug the extra hole in the bottom and fill in the gaps on the sides of the barrel at the rear.