I think you are on the right track with upgrading the receiver first.