Finished extracting the motor oil – well all but an inch or so. Replaced the two oil filters. I went with larger/longer ones which I think are closer to what the engine is supposed to have (thanks to previous owner for the info). The previous filters were loose and leaking a bit so I tightened these up with a filter tool. I regret tightening them up that much (not crazy tight) but I will just leave it.
I found a NAPA fuel filter which removes water by cross-referencing one of the filters (FRAM) that the previous owner suggested. So no need for any majour changes here. I replaced one (hand tight only) and ran the engine to complete the prime. I will do the other tomorrow. This leaves the fine filter on the engine. Not sure what the part number is for that. I may have to remove and do what NAPA employees really do not like – ‘hey you have a filter like this one?’.