Battery issue

[nhmaf]

Either will work, but you'll have a little more reserve capacity with the 22A-h one.   I tend to always go with the higher A-h rating battery I can, all else being equal.

Are you sure that you don't have an electrical leak (current draw) somewhere that is drawing your battery down while the bike is parked?   Were you measuring 13.4V or better at the battery terminals when the engine is running at 3500 RPM?