If you don't mind mixing new with the old, I am a big fan of throwing an external bottom bracket and corresponding crankset. My commuter (old Peugeot) has a Truvative GXP (or whatever the order the letters are in) and my gravel grinder has a FSA Mega Exo.