I am a big fan of Fluidmaster fill valves. Not sure if any total rebuild kits are available by this company. The flapper is the only other part that is normally replaced. The supply tube is normally dictated by the tank connection design. Both types you mentioned work well when installed properly.
If you have never made a mistake, you haven't done much.
Fluidmaster makes a rebuild kit with both the fill and flush valve. Normally the only reason the change the flush valve is the flapper set is pitted and a new flapper still leaks. To change the flush valve you have to remove the tank from the bowl. If you do, I recommend you replace the tank to bowl bolts and washers.