propller for Oceanis 321

Im having a problem with my Oceanis 321 propeller. I have a Radice 13R 3 blade fixed and a Yanmar MGM20F. Gear ratios are forward 2.21 and astern 3.06. Not too bad forward but going astern it wont pull the skin of a rice pudding in less thanb 20 minutes...not very good with the wind behind and going into a lock....any information from others with same boat would be appreciated as regards 1)prop diameter and pitch 2)folding or fixed 3)2 or 3 blades
bill thompson
thompsontraining@aol.com