If you get the pipe upgraded and still have low flow you could consider combining a combie with a cylinder. Run the shower from the combie and the other hot water from the vented cylinder. The result will be good showering fast filling baths and shower and bath can be used/filled simultainously.