Hey guys

My CBR F4 started having what seemed to be an electrical problem at the end of last season. It would start up fine and ride fine until I'd get stuck behind a red light and the fan would come on. RPM would then drop, the bike would stall and would not start back up (had to be bump started). I did some research online and found out that a lot of F4s have regulator/rectifier Issues so this year when I was having my carbs cleaned, I also had the R/R replaced and got a new battery as well. The bike's been running amazing all season .... until last week. It's not as bad as it was last year but I can tell it's getting there. After a long ride (15-30 min highway) my RMP starts twitching when the bike is idling and the fan comes on, the horn sounds like it has bronchitis (low voltage?) , and the backlight gets dimmer than normal when I apply the horn.
Here are my questions:
1) I've read online that one of the solutions to this is to replace the R/R with another bike'r R/R that doesn't have the issue. If this is true, what are my options and how labour intensive is it if I wanted to do it myself ?
2) Another side solution online is to replace the battery with a more powerful one. Again, what are my options and can I do it myself ?

Any feedback would be much appreciated.