Thank you guys. Thinking the same - might bite the bullet and go the expensive but the sure for the long term way.
Now the questions is - who would be the right guys to hire so that the job done is not with the same issues?
A lot of plumbing companies seem to be good with working quick fixes...