I'm looking for some advice with a dilemma I'm having. I inherited a residential steam heating system with an improperly piped boiler--there's no header, the riser connects directly to the steam main (pictures below). I lived with the system last winter. It did its job of warming the house in a reasonable amount of time, but the heating bills were high and the radiator vents were noisy. I could see steam coming out of the vents, so I'm guessing the improperly piped boiler is producing wet steam. The radiator vents are old, have been painted over, and probably need to be replaced. The boiler is also significantly over sized at 128,000 BTUs when my EDR calculation suggests I only need around 57,000. Other than all that, the boiler itself seems to be in fine shape and not in need of replacement in the immediate future--I believe it has been in service for about 5 years.
So I'm wondering the following:
(1) Is it worth it to have the boiler re-piped properly now or does it make sense to just wait for the current boiler to need replacement in say 5 years and then get everything done right when I replace the boiler?
(2) Will it just be a waste of money to replace the (old) radiator vents because the wet steam from the boiler will cause them to hiss and clog regardless whether they're new?
Thanks in advance for any wisdom you can provide.