The stock sail, roller furled, will work, and work well. It's not optimal, but few things are.

The Inter 20 jib battens are already angled, I assumed for this reason, to furl cleaner.

Don't just cut them out! Your leach will flap all the time!

Easiest way-leave them alone. I wouldn't store it furled to the forestay however more than a night!

The angled modification is a good idea also.

I roller furl my jib, with the stock batten set up, it works.