Definitely add more veggies - you are getting about half of what you should and lean towards the other allowed veggies.

As for whether the calories should be based on what you weigh or what you want to weigh - that is a topic of some debate.

Personally, I think it should be based on lean body mass according to the following guideline:

400 kcal + 10 kcal per pound of lean mass + 2 kcal per pound of fat.

Others say that it should be 10x to12x of your total current weight.

Both are just guidelines. The key is to not undereat (and I am very much guilty of that and it may well be slowing my weight loss).