Yes the plug in the oil gallery is a torx.
for the oil return I’ve done several. The one in the photo is a steel jic hydraulic fitting. Ive also done them with ali An10 fittings and a plain barbed spure. The last is the cheapest and was the least hassle.