Quick update, I've upgraded the Pentium G620 to a Core i5 2300. I was bored of waiting for AMD's BD, coupled with the absence of announced let alone available AM3+ ITX boards I decided now would be as good as any to upgrade, otherwise it looks like I'd be stuck with the G620 for a while.
Why the i5 2300? No particular reason other than the reasonable price I found it used on the bay, performance isn't too different to its faster brothers and there is no point going for the overclockable 2500K on a H67 motherboard.
To keep temps low on my thermally challenged machine I undervolted the 2300 to 1.0v.
New stats with modded CM GeminII and i5 2300 @ 1.0v
Idle 52W [+2W]
CPU: 34°C [-6°C]
GPU: 40°C [+3°C]
GPU & CPU load 240W [-4W]
CPU: 68°C (CPU load only 99W) [+5°C +29W]
GPU: 87°C (GPU load only 198W) [--°C -24W]
3DM11: 179W [+1W]
P4206 (Unapproved GPU drivers) [+1110]
What's surprising is the tiny increase of power draw during the 3DM11 bench and significant reduction of power draw during the furmark burn test, perhaps the work of updated GPU drivers.
Maybe if a wild AM3+ board appears and AMD BD chips are well priced in the future; I may go for an upgrade, but I consider this build to be complete; this machine is as fast and quiet as it can go without significant further expense or modification.
Thanks for the comments, was fun building my first non proprietary SFF gaming machine.