TS, my suggestion is to fully utilise your gears first before planning for upgrade.
But my suggestion is to go for L. I'd never regret buying and using them.
My vrigin L is a 17-40mm. Good, cheap, sharp and fast. It really make a good Ultra wide on FF.
:)