Sounds like you've made great progress so far!
At your height, I'd probably go the other route. It sounds like you started from a point of not much lean mass, but I'd look at trying to gain another 5kg or so of lean muscle (so probably about 7kg all up), and THEN try to bring the abs out.
__________________
Ben
|