So your in rented accommodation, yet your stripping shower down and messing around with it, Plumber can only do a certain amount, and will need landlords permission to spend money, something most landlords hate doing, you have a system (Boiler & Shower) that is 25 years old, and is worn out, Older combi's were not the best at delivering hot water, you are never going to get more out of it than what it was designed for (8 Lts on a good day) No good having a pop at plumber, you need to address these issues direct with landlord, and if your not happy with is reply , Then find somewhere else to live !!