Hi, My DS is on 1 nap and has been since that age too. He does fine waiting til after lunch for his nap most days, but if he wants to go to bed earlier, I just skip the lunch and do it after the nap. He does have morning tea mid morning (10ish) and I do Bf him before his nap either way.
I would suggest giving him lunch before the nap (could offer some formula in a sippy with that if you like), move the bottle to after then nap, add in afternoon tea in place of bottle and make the bedtime bottle a little bigger?