Urgh, that sounds a pain of a job. Good on you for taking the bull by the horns though.
Curious as to why you had to lap the valves again? I thought they only needed lapping after installing new valve seats or new valves with old seats. As a side note I replaced a burnt valve on an old Astra I had years ago and never bothered to lap it in and it ran fine.