going from 50mm to 40mm tires will not give you a better ride, will be worse.
if any changes to drivetrain, don't use 10-speed. May as well go to 11-speed.
i don't know how powerful you are, but a 50T chainring will be very fast, if you ever go that fast.