Not bad at all for 2 years!
You are correct, you need to get that contact pt a bit more in front.
Please see this vid: http://www.youtube.com/watch?v=cum1-iTP4cU
In general, with a more extreme fh grip like yours, a windshield-wiper finish might serve you better than over-the shoulder (which I assume is a by-product your classic fh).
Also, it's hard to see from this angle, but your elbow might be a little too close to your body in the fwd swing.