I would have initially agreed with you that the pump part shouldn't be at an angle, but my reference bottle actually has the pump built like this. I guess it comes down to the decision, what's more important: staying true to reference or making it look right? As for your suggestion about the whole piece above the cap needing to be larger, I'd say you are correct, it wouldn't hurt to be a little bigger, especially the nozzle. Maybe if I enlarged everything except the trigger?