Looking for a screen mod

I have a burning hatred for bezzels and some minor vision problems - is there any replacement screen for the OG deck that has a lot less bezzels? The cutout for the screen is a lot bigger than the display, and id like to use it.

If I can find one,at as well replace the buttons since game streaming is working so well that I'll probably be using the deck for another 5 years, so recommendations for comfortable buttons and sticks are appreciated :D