That's not a bad idea. I hate to drill the frame since I have already painted it.Probably, but not in much better shape than those that you have. You may want to salvage those.
The half moon plate thing is unique to the 25 and usually clean up nice. The shoulder bolt will press out after you clean it, it is the same as used in the FJ40 other than the threaded end diameter. You need to open up the hole in the frame mount (10 to 12MM?). Crappy pic but it should get the idea across, I happened to use aftermarket greasable FJ40 shackle pins. I discovered this after doing another with replacement standard size allen head shoulder bolts. View attachment 2595434