Looks good Lee, I know what Sean means about the front but they probably stand out more in the photos than reality.
Re the EE window surrounds, it is worth it in my opinion and not as hard as I envisaged, worth follwoing the approach outlined in the recent Rail Express Modeller (i.e, paint the etch, fit the glazing to the etch, then fit to the loco).