How about VDO p/n 224011000280G? Its 280mm long rather than 240mm that is fitted, the max tank depth is 290mm, so a little clearance and "reserve" rather than 20 lt or so that we have now.