I too, use the 5 gallon race jugs, I ended up gettign all green, have 4 of them and I associate green with diesel because of the filling stations. I know yellow is the standard.
JEGS has your need, 2.5 gallon jugs and even in all colors including yellow. These caps are standardized threads, so...