No, you forgot to consider the node between E2 and R4 inside blue circle. You could alternativelly replace both components by another current source and resistor, both in parallel with the other ones already there, which would certainly simplify the analysis by reducing the nodal matrix size.
You should to be aware of the fundamentals of the Thevenin/Northon equivalent circuits before going foward on that analysys. I think Wiki would explain it better than me.
I did not check if you made the correct calculations, but it is exactly what I was talking about.
- - - Updated - - -
Another tip: Why don't you convert the remaining voltage source/series resistence to the same Northon circuit ? This way, the source of the matrix vector would have just current, instead of a mix of current and voltage sources.
....
Here is an example of the nodes I think I should have in RED.
I am not quite sure if I am to use a SuperNode on the little part in the blue circle.