The factory solved the filling issue on my +8 - it wasn't cheap, but it now fills like a normal car. A revelation as I'd struggled for years.
B&C solved the wandering fuel gauge a while back, I think a new sensor/slide thing was fitted and properly lubricated I imagine. I drove it a couple of thousand miles through France this past summer and it was vastly improved.