I hear what you are saying about the Champion vs. Stock I/S locks, but I can tell you that the I/S front 'hooks' are an easy 'bolt right up' switch from the Champion hinges... I've done what you are doing, and swapped hardware with the guy I got the trunk from (he was going 'Super Valk'), and it worked out great!
Need to see pictures, when yer done

Black Dog