I missed my shot at a replacement for all my parts through Royal Tiger. They had a no4 with a bad receiver and barrel for around 150$ US that had an L serial number. It was sold before I could get through to a salesperson or I would have gotten my wood and metal in one go.
I keep perusing the online auctions hoping for an NZbayo but I know odds are long.
I should also note I landed an MA marked 1944 model 07 bayonet recently. It needs to be broken down so I can remove the rust from all but the blade. Of course now I need to find the no1 mk3 to match that one.