I'd go with choice #1 as it'll serve you best as a commuter, but I'd suggest swapping in a pair of aluminum alloy wheels for the steel that's on there now. That'll lighten the bike considerably and brake better when wet. The conversion you show in the pic has that sort of new wheelset.

Neal