Maybe it would be better just to subclass it and correct things you don't like instead of doing everything on your own? Your code looks a bit complicated.