Re:
Cool bike, excellent frame, good choice, bargain!
Personally i'd keep the gripshift if working and rubber barrel grips are not perished or sticky.
Stem looks gay but ok, comfort is more important. But get an original Marin stem as a spare - do a bit back flexibility exercise and ride more...