I recommend you an arena system as a new content (and also it will replace rebattle boss fight) such as 格闘王への道, The Arena from kirby series
It will be a good infinite challenge content and effective way to replay boss fight
While this mode(連続 arena content), raped or nene's rape can be seen again (during fight or after on the field before leave to next map)