Go for new main with vertical battens
had a 410 with rolller main, never satisfied with the shape of the sail, on my new 44ds opted for vertical batten roller main. Four battens, extend entire height of sail. This has made a tremendous difference. As a cruiser rather than (except very rarely) racer, I would never go back to a standard main. The roller furling allows me to sail shorthanded comfortably, put main up whenever I feel there is some wind. Have never had a problem with furling unless I did something really stupid, and even then nothing serious. Don't fuss with the jib, the design of these boats is for big main with big roach and small (easy to handle and see around) jib. Don't get rid of the rig, get a new vertical batten main.
S/V Breathless 2007 h44ds