As you already had to enlarge the trem block hole, did you enlarge it even further after moving the unit 2mm further forwards?