I love both your choices.

Henry is often "shortened" to Harry - even though they are the same length (so I don't really understand it) - not many people know that Prince Harry's real name is Henry.