Since your the one riding it / being seen on it paint is a good idea , if you want to make it a wall hanger then leaving the paint is paramount.
With that said , I would leave the white and sand the clear off the yellow , tape it and respray the yellow with say black for a easy cover up and paint scheme.
Technically you would be leaving the original paint under new for the next owners rediscovery , if he wants to do a complete restoration.
I have seen pros restore million dollar cars by stripping the current paint to reveal the original paint