Ok, so it looks like my options are to live with it since the motor is not running hot or replace the tank with a larger version. It's hard to get out of the oem mode where little things like this are engineered to work rather than cobbled together to sort of function good enough.

Thanks for the help. Guess I need to get my Christmas list updated..