If its a PR base you might consider the Everled replacement. 5 star rating ! See this site for more info as well as a link to a review are at http://www.ledsupply.com/evflbu.php
Don't have any suggestions for a replacement lens. I found a small hardware store that still cuts glass and the man cut a replacement lens for an old flashlight.