That sounds like a good plan, Chris, including putting the HK engine in storage. You might pick up some parts for it opportunistically and tidy it up sometime over the years, so the mower can be restored to original one day after it stops being used regularly. It's not that the HKs aren't usable, it's just that they aren't as nice to use as other engines, plus in general you can't get new parts for them.