Recommended Hardware for evolving ISP - BGP + PPPoE

Hi all,
We are a small but growing ISP / WISP about to evolve out network.
At the moment we have almost 1000 customers and will be growing to around 2000 over the next year with continued growth thereafter.
We have a 1G and a 500M feed into our network which will shortly be 5 x 1G.
We are just taking a default route from our upstream for BGP. (single homed).
We will be shortly co-locating in a data centre and our upstream provider will be providing us with CIR / Bearer of 10G / 10G.
We are routing our public IPs out to several PPPoE servers located at our towers / cabinets which has now become a subnetting management PITA! I’m sure this is familiar!

One option for growth was to Run one big, centralised PPPoE server with L2TP tunnels from the towers (LACs) so the clients can connect but MTiks don’t support the LAC end and the only affordable solution I have come up with would be to run lots of little BSDRP routers running as LACs connecting to the PPPoE server. This feels a bit risky in terms of support and I don’t want to end up being the only guy who understands this and never being able to go on holiday!

Another option would be to run VPLS internally to our client interfaces. This would involve more work configuring everything for MPLS but I think would be of benefit in the long run in that we could then offer VPLS to our customers if required.

So, my questions are:
Please recommend hardware that can handle up to say, 3000 PPPoE sessions AND have the option of moving to a full BGP table if required.
Would you separate BGP and PPPoE into 2 routers?
What about failover / load balancing?

I’d really appreciate any comments on this topic
Thanks
NTB

did you get any solution? if yes, kindly educate us too!