This sounds great! The only really complaint I have with this game is that you just have to keep repeating conversations and encounters to boost your affection. What you have planned sounds more fun.
