My thoughts are if youre not doing too much with milk, the Silvia may suit you better be better as its simpler.
A PID offers more precise control of brew temperature. Site sponsors PID kits and Jetblack are into PIDing Silvias. THe GEE has inbuilt temperature control out of the box, so does not require modification.
As for your grinder, at this level, you will need something better. Look at a Breville BCG800, an ex cafe grinder or perhaps a Compak K3T.
Some great stuff can be found at http://coffeesnobs.com.au/YaBB.pl?board=Auction and you get to support a great cause as well *8-)
Lastly, unless youre in law, its barista ;)