Well I just an hour ago pulled the trigger on Surly Narrow-Wide 28T for the front, Sunrace 10sp 11-42 for the back, and since it was only $18.95 and within budget, I ordered a goatlink as well. I saw links showing others using a goatlink for this RD and 11-42, so it seemed like a good idea. Hoping to make a few bucks back selling the front shifter and FD on CL. Will keep the 11-36 cassette around as a spare for other bikes.

Gear calculator comparison before and after. Tire size of 60-622 is a little small. Bottom mph at cadence 60 = climbing speed 3.1 --> 3.5mph. Spin-out at 120 drops 35-->27mph. Really a 26T would have been a better match for the bottom end, but there's not a lot of selection for 58bcd chainrings!