Sounds like a plan. Koni Yellows are an excellent shock and you can play with the drop height on them. Might buy some H&R OEMs and see if they fit you on one of the three height settings on the Yellows. Like I said, sounds like you've got it ironed out.