So, what is the better option?

1. Leave it as is.
2. Find a non-matching serial number stock and forearm?
3. Try to fix this one somehow better than it is now.