Larvae on raspberries - any advice?

I've inherited some raspberry canes with the house I've just moved into - which I'm very pleased about - but unfortunately quite a few of the berries I've picked so far have been home to greenish grey larvae (a little greener in reality than in the photo). Someone I work with suggested they may be sawfly, but from doing a little research they appear to be raspberry beetle larvae? The leaves are also all intact, which from what I can tell would not be the case with sawfly larvae.

Does anyone have an advice on a) an easy way to get them off the fruit I have this year (and is it okay to eat afterwards?), and b) any tips to keep them away from next year's fruit?

Any other tips for care/maintenance of the plants would be much appreciated too - it's all new to me. Thanks