Please do feel free to make more changes - most anything you do would be better than the original. By having the logical and proper couple asa the leading characters, working together with intelligence, you have already improved things by 80%.
this is a well written, enjoyable story, and I am glad that you are continuing it.
thanks for sharing