Bottom bracket feels rough, should I replace it
It sounds to me like the bearing are dry. While you might get a few more miles out of it, I would replace it. As you stated it is a non serviceable bearing assembly. You have most of the work done already so why put it back together only to have to take it apart later.