Sure sounds right to me.
The fuel pickup will have a dip tube, if not then your supposed to supply the dip tube, West
Marine sells good ones made from plastic, cut off to the correct length, screw it in.
I’d fit a dip tube on the return as well, I just don’t like falling fuel, the vent you leave alone of course.