i've got a complete new tank and cap and bracket on ebay at the moment.

check in parts for sale section for link