Thanks all. Hopefully, if the brakes I have on order ever make it past the shipyards, we will find the answer. If the brakes are all coming off, lines at that time are probably a good idea.
I have no idea what kind of bearings were added but I guess I can deal with all of that after the new brakes, rotors, lines and wheels go on.
Because I have to pay for it, I am hesitant to pay to fix the brakes now when they are just coming off in the near future.
However, I was rather hoping the wait for the brakes wouldn't take this long............ or much longer.