User blog comment:ToastSoul/Cape Kaga/@comment-200.128.77.250-20160503122646/@comment-26009184-20160503235534

The meanings are the same, but the nuances are slightly different (depending on who you ask, I suppose). The second person in your source 1 notes that はず sounds softer than わけ.

Of course, there's significant overlap (as everybody else in your sources noted), but as far as I can tell, they lean towards different implications (Although, again it's entirely up to interpretation).

As for the second part - I prefer it the way it is currently, so I'll leave it the way it is.