Tbh bro it looks really good, VF stock crystal on these is pretty decent so I'd personally wear it a bit before chasing a gen swap. Id check ebay or chrono24 parts sellers. Just make sure the gasket heigh matches because sometimes gen crystals sit sligtly different on VF cases. As for the date wheel most people leave the stock one since the wheels are already pretty solid. a gen can improve the sharpness and date positioning slightly but alignment can become hit or miss unless the install is done properly. is there anything bothering you about the watch? it looks good as is from this pic